Skip to content

Commit fade88a

Browse files
waydabberwaydabber
authored
Added a permanent scrollbar to Displays view (MonitorControl#694)
1 parent 0ed9d0f commit fade88a

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

‎MonitorControl/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>6539</string>
22+
<string>6581</string>
2323
<key>LSApplicationCategoryType</key>
2424
<string>public.app-category.utilities</string>
2525
<key>LSMinimumSystemVersion</key>

‎MonitorControl/UI/Base.lproj/Main.storyboard‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<gridColumn xPlacement="fill" width="470" leadingPadding="4" id="64O-72-10l"/>
4646
</columns>
4747
<gridCells>
48-
<gridCell row="d70-FX-dma" column="eHC-Ur-UsS" xPlacement="trailing" id="ixb-6N-RsC">
48+
<gridCell row="d70-FX-dma" column="eHC-Ur-UsS" xPlacement="trailing" yPlacement="center" id="ixb-6N-RsC">
4949
<textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HkH-iv-GLz">
5050
<rect key="frame" x="136" y="562" width="76" height="16"/>
5151
<textFieldCell key="cell" lineBreakMode="truncatingTail" baseWritingDirection="leftToRight" alignment="right" title="Application:" id="okD-DG-pYa">
@@ -86,7 +86,7 @@
8686
</box>
8787
</gridCell>
8888
<gridCell row="CrM-x5-re7" column="64O-72-10l" headOfMergedCell="UBc-A2-Il4" id="s0l-Gz-1c0"/>
89-
<gridCell row="DnA-aR-kcy" column="eHC-Ur-UsS" xPlacement="trailing" id="vO3-t1-Aqs">
89+
<gridCell row="DnA-aR-kcy" column="eHC-Ur-UsS" xPlacement="trailing" yPlacement="center" id="vO3-t1-Aqs">
9090
<textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vsD-wo-GE1">
9191
<rect key="frame" x="108" y="494" width="104" height="16"/>
9292
<textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="General options:" id="W58-ch-j69">
@@ -304,7 +304,7 @@
304304
</box>
305305
</gridCell>
306306
<gridCell row="ALY-LA-2OR" column="64O-72-10l" headOfMergedCell="cRV-TN-DdK" id="r3r-m7-Zcs"/>
307-
<gridCell row="cOB-Hr-kYl" column="eHC-Ur-UsS" xPlacement="trailing" id="2ao-6c-6bc">
307+
<gridCell row="cOB-Hr-kYl" column="eHC-Ur-UsS" xPlacement="trailing" yPlacement="center" id="2ao-6c-6bc">
308308
<textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GPV-cW-Jjc">
309309
<rect key="frame" x="144" y="51" width="68" height="16"/>
310310
<textFieldCell key="cell" lineBreakMode="clipping" title="Advanced:" id="r7i-oG-Ab6">
@@ -515,7 +515,7 @@
515515
</box>
516516
</gridCell>
517517
<gridCell row="Cor-61-8R5" column="V6M-Jv-Agj" headOfMergedCell="054-Ho-JWX" id="qgh-h4-pBB"/>
518-
<gridCell row="x3R-eu-dsV" column="FRJ-Rb-RRh" xPlacement="trailing" id="ncF-aj-FmT">
518+
<gridCell row="x3R-eu-dsV" column="FRJ-Rb-RRh" xPlacement="trailing" yPlacement="center" id="ncF-aj-FmT">
519519
<textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="T3u-43-BPw">
520520
<rect key="frame" x="93" y="380" width="119" height="16"/>
521521
<textFieldCell key="cell" lineBreakMode="clipping" title="Brightness control:" id="fe9-Ia-t9m">
@@ -572,7 +572,7 @@
572572
</textFieldCell>
573573
</textField>
574574
</gridCell>
575-
<gridCell row="d8s-SW-acK" column="FRJ-Rb-RRh" xPlacement="trailing" id="Gjt-20-GPt">
575+
<gridCell row="d8s-SW-acK" column="FRJ-Rb-RRh" xPlacement="trailing" yPlacement="center" id="Gjt-20-GPt">
576576
<textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UOL-wV-9me">
577577
<rect key="frame" x="90" y="286" width="122" height="16"/>
578578
<textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Additional controls:" id="i5X-M5-Tf5">
@@ -675,7 +675,7 @@
675675
</box>
676676
</gridCell>
677677
<gridCell row="7kD-xD-py0" column="V6M-Jv-Agj" headOfMergedCell="zOL-GT-1cQ" id="ZJZ-t6-dPA"/>
678-
<gridCell row="BmS-ju-SrX" column="FRJ-Rb-RRh" xPlacement="trailing" id="HyX-Ez-gvQ">
678+
<gridCell row="BmS-ju-SrX" column="FRJ-Rb-RRh" xPlacement="trailing" yPlacement="center" id="HyX-Ez-gvQ">
679679
<textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yvP-ra-lvk">
680680
<rect key="frame" x="113" y="129" width="99" height="16"/>
681681
<textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Slider behavior:" id="75n-7M-1mS">
@@ -1015,7 +1015,7 @@
10151015
</textFieldCell>
10161016
</textField>
10171017
</gridCell>
1018-
<gridCell row="jJT-as-drf" column="ZC2-Ja-sIb" xPlacement="trailing" id="nrK-Hc-7nO">
1018+
<gridCell row="jJT-as-drf" column="ZC2-Ja-sIb" xPlacement="trailing" yPlacement="center" id="nrK-Hc-7nO">
10191019
<textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vWz-eO-w5x">
10201020
<rect key="frame" x="141" y="329" width="71" height="16"/>
10211021
<textFieldCell key="cell" lineBreakMode="clipping" title="OSD scale:" id="bP4-GJ-vhJ">
@@ -1233,7 +1233,7 @@
12331233
</textFieldCell>
12341234
</textField>
12351235
</gridCell>
1236-
<gridCell row="fUL-yd-WWe" column="ZC2-Ja-sIb" xPlacement="trailing" id="Wh1-8h-lvf">
1236+
<gridCell row="fUL-yd-WWe" column="ZC2-Ja-sIb" xPlacement="trailing" yPlacement="center" id="Wh1-8h-lvf">
12371237
<textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GO6-iW-7qg">
12381238
<rect key="frame" x="141" y="0.0" width="71" height="16"/>
12391239
<textFieldCell key="cell" lineBreakMode="clipping" title="OSD scale:" id="Bqc-s3-C0w">
@@ -1310,20 +1310,20 @@
13101310
<view key="view" translatesAutoresizingMaskIntoConstraints="NO" id="aj0-6l-QE2">
13111311
<rect key="frame" x="0.0" y="0.0" width="730" height="533"/>
13121312
<subviews>
1313-
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="520" horizontalPageScroll="10" verticalLineScroll="520" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="O0W-8R-9c8">
1313+
<scrollView focusRingType="none" borderType="none" horizontalLineScroll="520" horizontalPageScroll="10" verticalLineScroll="520" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="O0W-8R-9c8">
13141314
<rect key="frame" x="0.0" y="0.0" width="730" height="532"/>
13151315
<clipView key="contentView" drawsBackground="NO" id="yDV-Al-LQT">
13161316
<rect key="frame" x="0.0" y="0.0" width="730" height="532"/>
13171317
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
13181318
<subviews>
13191319
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" tableStyle="inset" selectionHighlightStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="520" viewBased="YES" id="zC9-dS-Tr3">
1320-
<rect key="frame" x="0.0" y="0.0" width="730" height="532"/>
1320+
<rect key="frame" x="0.0" y="0.0" width="740" height="532"/>
13211321
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1322-
<size key="intercellSpacing" width="17" height="0.0"/>
1322+
<size key="intercellSpacing" width="14" height="0.0"/>
13231323
<color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
13241324
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
13251325
<tableColumns>
1326-
<tableColumn width="690" minWidth="40" maxWidth="690" id="3eK-hg-Tqu">
1326+
<tableColumn width="690" minWidth="690" maxWidth="690" id="3eK-hg-Tqu">
13271327
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
13281328
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
13291329
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -1333,10 +1333,9 @@
13331333
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
13341334
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
13351335
</textFieldCell>
1336-
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
13371336
<prototypeCellViews>
13381337
<tableCellView wantsLayer="YES" id="hCY-wr-B84" customClass="DisplaysPrefsCellView" customModule="MonitorControl">
1339-
<rect key="frame" x="18" y="0.0" width="685" height="520"/>
1338+
<rect key="frame" x="17" y="0.0" width="690" height="520"/>
13401339
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
13411340
<subviews>
13421341
<imageView wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="Bhw-JQ-dBx">
@@ -1994,13 +1993,14 @@
19941993
</tableView>
19951994
</subviews>
19961995
<nil key="backgroundColor"/>
1996+
<edgeInsets key="contentInsets" left="0.0" right="-10" top="0.0" bottom="0.0"/>
19971997
</clipView>
19981998
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="24Y-Ol-HHE">
1999-
<rect key="frame" x="-100" y="-100" width="689" height="16"/>
1999+
<rect key="frame" x="-100" y="-100" width="730" height="16"/>
20002000
<autoresizingMask key="autoresizingMask"/>
20012001
</scroller>
2002-
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="zbU-d8-F8n">
2003-
<rect key="frame" x="224" y="17" width="15" height="102"/>
2002+
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="NO" id="zbU-d8-F8n">
2003+
<rect key="frame" x="716" y="0.0" width="14" height="532"/>
20042004
<autoresizingMask key="autoresizingMask"/>
20052005
</scroller>
20062006
</scrollView>
@@ -2021,7 +2021,7 @@
20212021
</connections>
20222022
</viewController>
20232023
</objects>
2024-
<point key="canvasLocation" x="298" y="1569"/>
2024+
<point key="canvasLocation" x="298" y="1568.5"/>
20252025
</scene>
20262026
<!--About Prefs View Controller-->
20272027
<scene sceneID="Ot2-lL-eIg">

‎MonitorControl/View Controllers/DisplaysPrefsViewController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class DisplaysPrefsViewController: NSViewController, PreferencePane, NSTableView
2525
override func viewDidLoad() {
2626
super.viewDidLoad()
2727
self.loadDisplayList()
28+
self.displayScrollView.scrollerStyle = .legacy
2829
}
2930

3031
override func viewWillAppear() {

‎MonitorControlHelper/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>6539</string>
22+
<string>6581</string>
2323
<key>LSApplicationCategoryType</key>
2424
<string>public.app-category.utilities</string>
2525
<key>LSBackgroundOnly</key>

0 commit comments

Comments
 (0)