Skip to content

Commit f80f3a4

Browse files
authored
Merge pull request #141 from br1sk/ks/prefs-fix
Fix preferences window initial height
2 parents a62bf7f + f52172f commit f80f3a4

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

Brisk/Resources/Base.lproj/Main.storyboard

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
<capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
88
</dependencies>
@@ -128,7 +128,8 @@
128128
<action selector="runPageLayout:" target="Ady-hI-5gd" id="Din-rz-gC5"/>
129129
</connections>
130130
</menuItem>
131-
<menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
131+
<menuItem title="Print…" keyEquivalent="nil" id="aTl-1u-JFS">
132+
<modifierMask key="keyEquivalentModifierMask"/>
132133
<connections>
133134
<action selector="print:" target="Ady-hI-5gd" id="qaZ-4w-aoO"/>
134135
</connections>
@@ -909,7 +910,6 @@ DQ
909910
<rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
910911
<autoresizingMask key="autoresizingMask"/>
911912
<font key="font" metaFont="message"/>
912-
<tabViewItems/>
913913
<connections>
914914
<outlet property="delegate" destination="BhG-02-uGX" id="hiM-nb-0y6"/>
915915
</connections>
@@ -987,7 +987,7 @@ DQ
987987
<rect key="frame" x="0.0" y="0.0" width="450" height="61"/>
988988
<autoresizingMask key="autoresizingMask"/>
989989
<subviews>
990-
<button translatesAutoresizingMaskIntoConstraints="NO" id="P60-fg-bV0">
990+
<button verticalHuggingPriority="501" translatesAutoresizingMaskIntoConstraints="NO" id="P60-fg-bV0">
991991
<rect key="frame" x="165" y="22" width="120" height="18"/>
992992
<buttonCell key="cell" type="check" title="Show Dock Icon" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="qTh-O2-m75">
993993
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -1007,10 +1007,12 @@ DQ
10071007
</textField>
10081008
</subviews>
10091009
<constraints>
1010-
<constraint firstItem="P60-fg-bV0" firstAttribute="centerY" secondItem="yLd-6I-DVb" secondAttribute="centerY" id="BDf-bH-0H1"/>
1010+
<constraint firstAttribute="bottom" secondItem="P60-fg-bV0" secondAttribute="bottom" constant="24" id="19f-MD-Ewg"/>
1011+
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="JeI-yg-d2G" secondAttribute="trailing" id="BNF-wu-hYT"/>
10111012
<constraint firstItem="JeI-yg-d2G" firstAttribute="baseline" secondItem="P60-fg-bV0" secondAttribute="baseline" id="XBe-y1-RRm"/>
10121013
<constraint firstItem="P60-fg-bV0" firstAttribute="centerX" secondItem="yLd-6I-DVb" secondAttribute="centerX" id="mHe-se-yn7"/>
10131014
<constraint firstItem="JeI-yg-d2G" firstAttribute="leading" secondItem="P60-fg-bV0" secondAttribute="trailing" constant="8" id="mTk-Hs-hNq"/>
1015+
<constraint firstItem="P60-fg-bV0" firstAttribute="top" secondItem="yLd-6I-DVb" secondAttribute="top" constant="23" id="wCh-rT-c7g"/>
10141016
</constraints>
10151017
</view>
10161018
</viewController>

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
## Bug Fixes
1212

13+
- Fix preferences window default height
14+
[change](https://github.com/br1sk/brisk/pull/141)
15+
1316
- Update Sonar
1417
[issue 1](https://github.com/br1sk/brisk/issues/136)
1518
[issue 2](https://github.com/br1sk/brisk/issues/137)

0 commit comments

Comments
 (0)