Skip to content

Commit b9985b8

Browse files
author
undecoded-coder
committed
Remove dependencies on ScopeBar (NSView subclass)
1 parent 08f4450 commit b9985b8

File tree

2 files changed

+21
-24
lines changed

2 files changed

+21
-24
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
6666
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
6767
<tableColumns>
68-
<tableColumn editable="NO" width="178.08999633789062" minWidth="16" maxWidth="1000" id="55">
68+
<tableColumn editable="NO" width="149.08999633789062" minWidth="16" maxWidth="1000" id="55">
6969
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="File Contents">
7070
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
7171
<color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
@@ -155,7 +155,7 @@
155155
</menu>
156156
</popUpButtonCell>
157157
</popUpButton>
158-
<customView id="1044" customClass="ScopeBar">
158+
<customView id="1044">
159159
<rect key="frame" x="0.0" y="726" width="192" height="25"/>
160160
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
161161
<subviews>
@@ -202,7 +202,7 @@
202202
<rect key="frame" x="193" y="0.0" width="831" height="751"/>
203203
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
204204
<subviews>
205-
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="484" customClass="ScopeBar">
205+
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="484">
206206
<rect key="frame" x="0.0" y="726" width="831" height="25"/>
207207
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
208208
<subviews>
@@ -467,7 +467,7 @@
467467
<sortDescriptor key="sortDescriptorPrototype" selector="numericCompare:" sortKey="Part Number"/>
468468
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
469469
</tableColumn>
470-
<tableColumn identifier="Part Name" editable="NO" width="8" minWidth="8" maxWidth="1000" id="28">
470+
<tableColumn identifier="Part Name" editable="NO" width="10" minWidth="8" maxWidth="1000" id="28">
471471
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Description">
472472
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
473473
<color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>

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

Lines changed: 17 additions & 20 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="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment version="1070" identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -33,7 +33,7 @@
3333
<windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES"/>
3434
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
3535
<rect key="contentRect" x="57" y="285" width="416" height="496"/>
36-
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
36+
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
3737
<value key="minSize" type="size" width="400" height="107"/>
3838
<view key="contentView" id="109">
3939
<rect key="frame" x="0.0" y="0.0" width="416" height="496"/>
@@ -91,14 +91,13 @@
9191
<subviews>
9292
<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">
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>
@@ -117,11 +116,11 @@
117116
</outlineView>
118117
</subviews>
119118
</clipView>
120-
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="212">
119+
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="212">
121120
<rect key="frame" x="-100" y="-100" width="150" height="11"/>
122121
<autoresizingMask key="autoresizingMask"/>
123122
</scroller>
124-
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" controlSize="small" horizontal="NO" id="211">
123+
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="NO" id="211">
125124
<rect key="frame" x="136" y="17" width="11" height="193"/>
126125
<autoresizingMask key="autoresizingMask"/>
127126
</scroller>
@@ -130,19 +129,18 @@
130129
<rect key="frame" x="136" y="0.0" width="280" height="293"/>
131130
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
132131
<clipView key="contentView" id="Nr6-g1-l4J">
133-
<rect key="frame" x="1" y="0.0" width="267" height="292"/>
132+
<rect key="frame" x="1" y="1" width="278" height="291"/>
134133
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
135134
<subviews>
136135
<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">
137-
<rect key="frame" x="0.0" y="0.0" width="267" height="269"/>
138-
<autoresizingMask key="autoresizingMask"/>
136+
<rect key="frame" x="0.0" y="0.0" width="278" height="268"/>
137+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
139138
<size key="intercellSpacing" width="3" height="2"/>
140139
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
141140
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
142141
<tableColumns>
143142
<tableColumn identifier="Part Number" editable="NO" width="70" minWidth="40" maxWidth="1000" id="113">
144143
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Part">
145-
<font key="font" metaFont="smallSystem"/>
146144
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
147145
<color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
148146
</tableHeaderCell>
@@ -154,9 +152,8 @@
154152
<sortDescriptor key="sortDescriptorPrototype" selector="numericCompare:" sortKey="Part Number"/>
155153
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
156154
</tableColumn>
157-
<tableColumn identifier="Part Name" editable="NO" width="191.08999633789062" minWidth="8" maxWidth="1000" id="116">
155+
<tableColumn identifier="Part Name" editable="NO" width="193.08999633789062" minWidth="8" maxWidth="1000" id="116">
158156
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Description">
159-
<font key="font" metaFont="smallSystem"/>
160157
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
161158
<color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
162159
</tableHeaderCell>
@@ -176,20 +173,20 @@
176173
</tableView>
177174
</subviews>
178175
</clipView>
179-
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="0.0037453183520599251" controlSize="small" horizontal="YES" id="203">
176+
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.0037453183520599251" controlSize="small" horizontal="YES" id="203">
180177
<rect key="frame" x="-100" y="-100" width="403" height="11"/>
181178
<autoresizingMask key="autoresizingMask"/>
182179
</scroller>
183-
<scroller key="verticalScroller" verticalHuggingPriority="750" controlSize="small" horizontal="NO" id="202">
184-
<rect key="frame" x="268" y="23" width="11" height="269"/>
180+
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="NO" id="202">
181+
<rect key="frame" x="265" y="24" width="14" height="268"/>
185182
<autoresizingMask key="autoresizingMask"/>
186183
</scroller>
187-
<tableHeaderView key="headerView" id="204">
188-
<rect key="frame" x="0.0" y="0.0" width="267" height="23"/>
184+
<tableHeaderView key="headerView" wantsLayer="YES" id="204">
185+
<rect key="frame" x="0.0" y="0.0" width="278" height="23"/>
189186
<autoresizingMask key="autoresizingMask"/>
190187
</tableHeaderView>
191188
</scrollView>
192-
<customView id="224" customClass="ScopeBar">
189+
<customView id="224">
193190
<rect key="frame" x="0.0" y="293" width="416" height="26"/>
194191
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
195192
<subviews>

0 commit comments

Comments
 (0)