Skip to content

Commit 901513a

Browse files
gnachmangnachman
committed
Ensure searchable combo list views don't scroll horizontally
1 parent 4b28473 commit 901513a

File tree

9 files changed

+22
-15
lines changed

9 files changed

+22
-15
lines changed

‎Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,14 @@ BetterFontPicker-Dev: force
221221

222222
bindeps: SwiftyMarkdown Highlightr BetterFontPicker
223223
cd ColorPicker && $(MAKE)
224+
$(MAKE) SearchableComboListView
225+
226+
SearchableComboListView: force
224227
cd SearchableComboListView && $(MAKE)
225228

229+
paranoidsclv: force
230+
/usr/bin/sandbox-exec -f deps.sb $(MAKE) SearchableComboListView
231+
226232
SwiftyMarkdown: force
227233
cd submodules/SwiftyMarkdown && xcodebuild -configuration Release 'CONFIGURATION_BUILD_DIR=$$(SRCROOT)/Build/$$(CONFIGURATION)'
228234
rm -rf ThirdParty/SwiftyMarkdown.framework

‎SearchableComboListView/SearchableComboListView.framework/Versions/A/Modules/SearchableComboListView.swiftmodule/Project/arm64-apple-macos.swiftsourceinfo

0 Bytes
Binary file not shown.

‎SearchableComboListView/SearchableComboListView.framework/Versions/A/Modules/SearchableComboListView.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo

0 Bytes
Binary file not shown.

‎SearchableComboListView/SearchableComboListView.framework/Versions/A/Resources/SearchableComboView.nib/keyedobjects-101500.nib

4 Bytes
Binary file not shown.

‎SearchableComboListView/SearchableComboListView.framework/Versions/A/Resources/SearchableComboView.nib/keyedobjects-110000.nib

4 Bytes
Binary file not shown.

‎SearchableComboListView/SearchableComboListView.framework/Versions/A/SearchableComboListView

0 Bytes
Binary file not shown.

‎SearchableComboListView/SearchableComboListView.framework/Versions/A/_CodeSignature/CodeResources

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
</data>
1111
<key>Resources/SearchableComboView.nib/keyedobjects-101500.nib</key>
1212
<data>
13-
ZSEfHT1yantTpGNES4DbiXJjY9c=
13+
WCB+OsmiegkRoDd1pVjuSuPNhAY=
1414
</data>
1515
<key>Resources/SearchableComboView.nib/keyedobjects-110000.nib</key>
1616
<data>
17-
TqBak+opOf9UF+V5rqb3/CBpat4=
17+
c5TrqldcSrltBblqNOVM5LXwXT4=
1818
</data>
1919
</dict>
2020
<key>files2</key>
@@ -37,14 +37,14 @@
3737
<dict>
3838
<key>hash2</key>
3939
<data>
40-
9wtM3OpK2ngn9plcp4YEWaQzUnhV+Z8sYWaRtiqta4w=
40+
bSB1l8FiDXKX7+p3P1k7W4iviIZBg8wACjEeFn2aS/s=
4141
</data>
4242
</dict>
4343
<key>Modules/SearchableComboListView.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo</key>
4444
<dict>
4545
<key>hash2</key>
4646
<data>
47-
N3vnvsqaARJrEMPPYCxQYEB4vAFN3zw08WWfCbmfAno=
47+
pwfIAIQDOVixXCOFZzUG/bbblthBtSiz9IVL0xKM7x4=
4848
</data>
4949
</dict>
5050
<key>Modules/SearchableComboListView.swiftmodule/arm64-apple-macos.abi.json</key>
@@ -135,14 +135,14 @@
135135
<dict>
136136
<key>hash2</key>
137137
<data>
138-
Oz/RAhdm+tB0D9m8DuLq+NopbE8ODnUFS4mTrvgN51M=
138+
69FvyfwAQFyOji4n6PyG4kBdpzb4JufAEkThyJ9efqU=
139139
</data>
140140
</dict>
141141
<key>Resources/SearchableComboView.nib/keyedobjects-110000.nib</key>
142142
<dict>
143143
<key>hash2</key>
144144
<data>
145-
+7oGHjEbVuCYUhtxm5xaKPBVNrwpdIbByE5nltJZQZ4=
145+
c28XXS8OnSBfTs/0bWdmyWivLqeTB86SdlOLY9m/cD8=
146146
</data>
147147
</dict>
148148
</dict>

‎SearchableComboListView/SearchableComboView/SearchableComboListViewController.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ class SearchableComboListViewController: NSViewController {
7272
public override func awakeFromNib() {
7373
tableViewController = SearchableComboTableViewController(tableView: tableView, groups: groups)
7474
tableViewController?.delegate = self
75+
tableView?.enclosingScrollView?.hasHorizontalScroller = false
7576
visualEffectView.blendingMode = .behindWindow;
7677
visualEffectView.material = .menu;
7778
visualEffectView.state = .active;

‎SearchableComboListView/SearchableComboView/SearchableComboView.xib

Lines changed: 9 additions & 9 deletions
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.XIB" version="3.0" toolsVersion="19455" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19455"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -37,7 +37,7 @@
3737
<outlet property="searchableComboListSearchFieldDelegate" destination="-2" id="vCR-hH-og6"/>
3838
</connections>
3939
</searchField>
40-
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eiM-xw-lIe" userLabel="Scroll View - SearchableComboTableView">
40+
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eiM-xw-lIe" userLabel="Scroll View - SearchableComboTableView">
4141
<rect key="frame" x="1" y="0.0" width="495" height="242"/>
4242
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
4343
<clipView key="contentView" drawsBackground="NO" id="4rp-kY-UdD">
@@ -67,7 +67,7 @@
6767
<rect key="frame" x="0.0" y="1" width="22" height="17"/>
6868
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
6969
<subviews>
70-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XfS-LC-He8">
70+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XfS-LC-He8">
7171
<rect key="frame" x="0.0" y="0.0" width="22" height="17"/>
7272
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
7373
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Ko9-YO-erd">
@@ -83,7 +83,7 @@
8383
</tableCellView>
8484
</prototypeCellViews>
8585
</tableColumn>
86-
<tableColumn identifier="searchableComboViewLabel" width="464" minWidth="40" maxWidth="1000" id="dHb-Bm-3au" userLabel="Label Column">
86+
<tableColumn identifier="searchableComboViewLabel" width="432" minWidth="40" maxWidth="1000" id="dHb-Bm-3au" userLabel="Label Column">
8787
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
8888
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
8989
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -96,11 +96,11 @@
9696
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
9797
<prototypeCellViews>
9898
<tableCellView id="Fuo-fd-knB">
99-
<rect key="frame" x="22" y="1" width="470" height="17"/>
99+
<rect key="frame" x="22" y="1" width="438" height="17"/>
100100
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
101101
<subviews>
102-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7ft-xb-inv">
103-
<rect key="frame" x="0.0" y="0.0" width="661" height="17"/>
102+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7ft-xb-inv">
103+
<rect key="frame" x="0.0" y="0.0" width="629" height="17"/>
104104
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
105105
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="31h-C6-Nud">
106106
<font key="font" metaFont="system"/>
@@ -121,7 +121,7 @@
121121
<nil key="backgroundColor"/>
122122
</clipView>
123123
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="IZv-Rf-jMG">
124-
<rect key="frame" x="1" y="225" width="378" height="16"/>
124+
<rect key="frame" x="-100" y="-100" width="378" height="16"/>
125125
<autoresizingMask key="autoresizingMask"/>
126126
</scroller>
127127
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="vfW-IZ-Nh1">

0 commit comments

Comments
 (0)