Fix tag reading from IB

Both controls and cells can have tags in IB, but Cappuccino has no cells. If the control has a tag, that takes precedence. Tag reading was moved to NSControl from NSView, since NSView does not have a tag in Cocoa.
cappuccino · Sep 28, 2012 · 8ff2a32 · 8ff2a32
1 parent 90d52a8
commit 8ff2a32
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/AppKit/CPView.j b/AppKit/CPView.j
@@ -3072,6 +3072,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
 
         [self _setupToolTipHandlers];
         _toolTip = [aCoder decodeObjectForKey:CPViewToolTipKey];
+
         if (_toolTip)
             [self _installToolTipEventHandlers];
 

diff --git a/Tools/nib2cib/NSButton.j b/Tools/nib2cib/NSButton.j
@@ -269,8 +269,6 @@ var NSButtonIsBorderedMask = 0x00800000,
     _highlightsBy = [cell highlightsBy];
     _showsStateBy = [cell showsStateBy];
 
-    [self setTag:[cell tag]];
-
     return self;
 }
 

diff --git a/Tools/nib2cib/NSControl.j b/Tools/nib2cib/NSControl.j
@@ -56,6 +56,11 @@
         [self setLineBreakMode:[cell lineBreakMode]];
 
         [self setFormatter:[cell formatter]];
+
+        // In IB, both cells and controls can have tags.
+        // If the control has a tag, that takes precedence.
+        if ([aCoder containsValueForKey:@"NSTag"])
+            [self setTag:[aCoder decodeIntForKey:@"NSTag"]];
     }
 
     return self;