Skip to content

Commit d334065

Browse files
Use view-based outline view for category tree. Fixes display problems on Mac OS 11.
1 parent 5148876 commit d334065

File tree

3 files changed

+101
-64
lines changed

3 files changed

+101
-64
lines changed

trunk/Bricksmith/Resources/Interface/English.lproj/PartBrowser.xib

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
4-
<deployment version="1070" identifier="macosx"/>
4+
<deployment identifier="macosx"/>
55
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
@@ -89,16 +89,15 @@
8989
<rect key="frame" x="1" y="1" width="135" height="291"/>
9090
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
9191
<subviews>
92-
<outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="20" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="215" id="213">
92+
<outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="20" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="215" id="213">
9393
<rect key="frame" x="0.0" y="0.0" width="135" height="291"/>
94-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
94+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
9595
<size key="intercellSpacing" width="2" height="3"/>
9696
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
9797
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
9898
<tableColumns>
99-
<tableColumn width="133" minWidth="16" maxWidth="1000" id="215">
99+
<tableColumn width="123" minWidth="16" maxWidth="1000" id="215">
100100
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
101-
<font key="font" metaFont="smallSystem"/>
102101
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
103102
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
104103
</tableHeaderCell>
@@ -108,6 +107,44 @@
108107
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
109108
</textFieldCell>
110109
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
110+
<prototypeCellViews>
111+
<tableCellView identifier="HeaderCell" id="3nA-cB-ITN" userLabel="Header">
112+
<rect key="frame" x="1" y="1" width="123" height="14"/>
113+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
114+
<subviews>
115+
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="DLa-Cg-1ui">
116+
<rect key="frame" x="0.0" y="-3" width="123" height="14"/>
117+
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
118+
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Header" id="j2W-Ma-Tg4">
119+
<font key="font" metaFont="smallSystem"/>
120+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
121+
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
122+
</textFieldCell>
123+
</textField>
124+
</subviews>
125+
<connections>
126+
<outlet property="textField" destination="DLa-Cg-1ui" id="nrr-aE-fTg"/>
127+
</connections>
128+
</tableCellView>
129+
<tableCellView identifier="CategoryCell" id="Hjg-4W-uKA" userLabel="Data Cell">
130+
<rect key="frame" x="1" y="18" width="123" height="14"/>
131+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
132+
<subviews>
133+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Upk-z4-o3Y">
134+
<rect key="frame" x="0.0" y="0.0" width="123" height="14"/>
135+
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
136+
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="6EK-YD-6EQ">
137+
<font key="font" metaFont="smallSystem"/>
138+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
139+
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
140+
</textFieldCell>
141+
</textField>
142+
</subviews>
143+
<connections>
144+
<outlet property="textField" destination="Upk-z4-o3Y" id="31j-8S-KDW"/>
145+
</connections>
146+
</tableCellView>
147+
</prototypeCellViews>
111148
</tableColumn>
112149
</tableColumns>
113150
<connections>
@@ -135,7 +172,7 @@
135172
<subviews>
136173
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" emptySelection="NO" autosaveName="PartBrowserPanelTable" rowHeight="14" headerView="204" id="115" customClass="PartBrowserTableView">
137174
<rect key="frame" x="0.0" y="0.0" width="267" height="269"/>
138-
<autoresizingMask key="autoresizingMask"/>
175+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
139176
<size key="intercellSpacing" width="3" height="2"/>
140177
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
141178
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
@@ -154,7 +191,7 @@
154191
<sortDescriptor key="sortDescriptorPrototype" selector="numericCompare:" sortKey="Part Number"/>
155192
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
156193
</tableColumn>
157-
<tableColumn identifier="Part Name" editable="NO" width="191.08999633789062" minWidth="8" maxWidth="1000" id="116">
194+
<tableColumn identifier="Part Name" editable="NO" width="182.08999633789062" minWidth="8" maxWidth="1000" id="116">
158195
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Description">
159196
<font key="font" metaFont="smallSystem"/>
160197
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -184,7 +221,7 @@
184221
<rect key="frame" x="268" y="23" width="11" height="269"/>
185222
<autoresizingMask key="autoresizingMask"/>
186223
</scroller>
187-
<tableHeaderView key="headerView" id="204">
224+
<tableHeaderView key="headerView" wantsLayer="YES" id="204">
188225
<rect key="frame" x="0.0" y="0.0" width="267" height="23"/>
189226
<autoresizingMask key="autoresizingMask"/>
190227
</tableHeaderView>

0 commit comments

Comments
 (0)