colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-06 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

nib2cib size fix for bordered CPColorWell.

Browse Source
This commit is contained in:
Alexander Ljungberg
2012-07-09 19:19:38 +01:00
parent b09908e6af
commit 2d8a849d12
3 changed files with 72 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/Manual/CPColorWellBindings/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/CPColorWellBindings/Resources/MainMenu.xib
+63 -10
View File
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">11C74</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1138.23</string>
<string key="IBDocument.HIToolboxVersion">567.00</string>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">1938</string>
<string key="NS.object.0">2182</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -72,7 +72,7 @@
<string key="NSFrame">{{213, 430}, {103, 23}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="398618613"/>
<reference key="NSNextKeyView" ref="523287691"/>
<string key="NSReuseIdentifierKey">_NS:1100</string>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
@@ -297,13 +297,34 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSColorWell" id="523287691">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSColor pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{324, 430}, {103, 23}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="398618613"/>
<string key="NSReuseIdentifierKey">_NS:1100</string>
<bool key="NSEnabled">YES</bool>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA</bytes>
</object>
</object>
</object>
<string key="NSFrameSize">{715, 473}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="456648631"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -349,10 +370,14 @@
<string key="NSLabel">value: selection.color</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">selection.color</string>
<object class="NSDictionary" key="NSOptions">
<string key="NS.key.0">NSConditionallySetsEnabled</string>
<boolean value="NO" key="NS.object.0"/>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">523</int>
<int key="connectionID">540</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
@@ -438,6 +463,26 @@
</object>
<int key="connectionID">534</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: selection.color</string>
<reference key="source" ref="523287691"/>
<reference key="destination" ref="856062832"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="523287691"/>
<reference key="NSDestination" ref="856062832"/>
<string key="NSLabel">value: selection.color</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">selection.color</string>
<object class="NSDictionary" key="NSOptions">
<string key="NS.key.0">NSConditionallySetsEnabled</string>
<boolean value="NO" key="NS.object.0"/>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">541</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -486,6 +531,7 @@
<reference ref="179216000"/>
<reference ref="398618613"/>
<reference ref="1048092682"/>
<reference ref="523287691"/>
</object>
<reference key="parent" ref="972006081"/>
</object>
@@ -576,6 +622,11 @@
<reference key="object" ref="354097929"/>
<reference key="parent" ref="1048092682"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">538</int>
<reference key="object" ref="523287691"/>
<reference key="parent" ref="439893737"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -602,8 +653,9 @@
<string>507.IBPluginDependency</string>
<string>520.IBPluginDependency</string>
<string>521.IBPluginDependency</string>
<string>538.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -625,6 +677,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -639,7 +692,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">535</int>
<int key="maxID">541</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Tools/nib2cib/NSColorWell.j
+8
View File
@@ -38,6 +38,14 @@
[self setEnabled:[aCoder decodeBoolForKey:@"NSEnabled"]];
[self setBordered:[aCoder decodeBoolForKey:@"NSIsBordered"]];
[self setColor:[aCoder decodeObjectForKey:@"NSColor"]];
if ([self isBordered])
{
var frameSize = [self frameSize];
CPLog.debug("NSColorWell: adjusting height from %d to %d", frameSize.height, 24.0);
frameSize.height = 24.0;
[self setFrameSize:frameSize];
}
}
return self;