Skip to content

Commit 3f2b73c

Browse files
lucasderraughlucasderraugh
committed
Change NSWindow to be full size content view. This allows for Tahoe under toolbar effects.
Fixes up various constraint issues and fixes placement of help and overlay views to account for full size content view change. Adds auto layout based cells to commit list view (search)
1 parent f29dac5 commit 3f2b73c

File tree

7 files changed

+228
-216
lines changed

7 files changed

+228
-216
lines changed

‎GitUp/Application/Base.lproj/Document.xib‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@
5555
<outlet property="window" destination="xOd-HO-29H" id="JIz-fz-R2o"/>
5656
</connections>
5757
</customObject>
58-
<window title="Window" separatorStyle="line" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="xOd-HO-29H" userLabel="Main Window" customClass="GIWindow">
59-
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
58+
<window title="Window" separatorStyle="line" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" toolbarStyle="unified" id="xOd-HO-29H" userLabel="Main Window" customClass="GIWindow">
59+
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
6060
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
6161
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
6262
<rect key="contentRect" x="253" y="204" width="1000" height="500"/>
63-
<rect key="screenRect" x="0.0" y="0.0" width="1728" height="1084"/>
64-
<value key="minSize" type="size" width="800" height="400"/>
63+
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1410"/>
64+
<value key="minSize" type="size" width="800" height="490"/>
6565
<view key="contentView" id="gIp-Ho-8D9">
6666
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
6767
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
6868
<subviews>
6969
<customView hidden="YES" appearanceType="aqua" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zjf-1c-7Wk" customClass="GIColorView">
70-
<rect key="frame" x="0.0" y="450" width="1000" height="50"/>
70+
<rect key="frame" x="0.0" y="400" width="1000" height="50"/>
7171
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
7272
<subviews>
7373
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hTO-MR-3XZ">
@@ -132,49 +132,49 @@
132132
</tabViewItem>
133133
<tabViewItem label="QuickView" identifier="quickview" id="lZZ-Pi-ftk">
134134
<view key="view" id="oyq-DX-wtX">
135-
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
135+
<rect key="frame" x="0.0" y="0.0" width="1000" height="531"/>
136136
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
137137
</view>
138138
</tabViewItem>
139139
<tabViewItem label="Diff" identifier="diff" id="Zf6-Lu-ykr">
140140
<view key="view" id="WCe-UI-kea">
141-
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
141+
<rect key="frame" x="0.0" y="0.0" width="1000" height="531"/>
142142
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
143143
</view>
144144
</tabViewItem>
145145
<tabViewItem label="Rewrite" identifier="rewrite" id="2rq-Yc-FZg" userLabel="Rewrite">
146146
<view key="view" id="0Om-In-WCJ">
147-
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
147+
<rect key="frame" x="0.0" y="0.0" width="1000" height="531"/>
148148
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
149149
</view>
150150
</tabViewItem>
151151
<tabViewItem label="Split" identifier="split" id="Ix2-LZ-4Bu" userLabel="Split">
152152
<view key="view" id="eld-gQ-vK9">
153-
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
153+
<rect key="frame" x="0.0" y="0.0" width="1000" height="531"/>
154154
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
155155
</view>
156156
</tabViewItem>
157157
<tabViewItem label="Resolve" identifier="resolve" id="GZi-Cj-7Lj" userLabel="Resolve">
158158
<view key="view" id="qfF-Zh-xYt">
159-
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
159+
<rect key="frame" x="0.0" y="0.0" width="1000" height="531"/>
160160
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
161161
</view>
162162
</tabViewItem>
163163
<tabViewItem label="Commit" identifier="commit" id="nIS-m1-wSa">
164164
<view key="view" id="s88-QZ-O0i">
165-
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
165+
<rect key="frame" x="0.0" y="0.0" width="1000" height="531"/>
166166
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
167167
</view>
168168
</tabViewItem>
169169
<tabViewItem label="Stashes" identifier="stashes" id="2be-V6-QZz">
170170
<view key="view" id="t1Z-eK-4g6">
171-
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
171+
<rect key="frame" x="0.0" y="0.0" width="1000" height="531"/>
172172
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
173173
</view>
174174
</tabViewItem>
175175
<tabViewItem label="Config" identifier="config" id="UEe-IZ-19Z">
176176
<view key="view" id="mhf-LA-IQ4">
177-
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
177+
<rect key="frame" x="0.0" y="0.0" width="1000" height="531"/>
178178
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
179179
</view>
180180
</tabViewItem>
@@ -737,7 +737,7 @@ Adjust settings in Show menu</string>
737737
<windowStyleMask key="styleMask" titled="YES"/>
738738
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
739739
<rect key="contentRect" x="131" y="158" width="450" height="173"/>
740-
<rect key="screenRect" x="0.0" y="0.0" width="1728" height="1084"/>
740+
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1410"/>
741741
<view key="contentView" id="l4r-5b-f0f">
742742
<rect key="frame" x="0.0" y="0.0" width="450" height="173"/>
743743
<autoresizingMask key="autoresizingMask"/>

‎GitUp/Application/Document.m‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,9 +910,14 @@ - (void)_showHelpWithIdentifier:(NSString*)identifier {
910910
XLOG_DEBUG_UNREACHABLE();
911911
}
912912
if (showHelp) {
913+
NSWindow *window = _mainTabView.window;
914+
CGRect frame = window.frame;
915+
CGRect layoutRect = window.contentLayoutRect;
916+
CGFloat toolbarHeight = frame.size.height - layoutRect.size.height;
917+
913918
NSRect contentBounds = _contentView.bounds;
914919
_helpView.hidden = NO;
915-
_mainTabView.frame = NSMakeRect(contentBounds.origin.x, contentBounds.origin.y, contentBounds.size.width, contentBounds.size.height - _helpView.frame.size.height);
920+
_mainTabView.frame = NSMakeRect(contentBounds.origin.x, contentBounds.origin.y, contentBounds.size.width, contentBounds.size.height - _helpView.frame.size.height - toolbarHeight);
916921
} else if (!_helpView.hidden) {
917922
_mainTabView.frame = _contentView.bounds;
918923
_helpView.hidden = YES;

0 commit comments

Comments
 (0)