From 62e8d70d745cb971c312324e63aba3cce82ca73e Mon Sep 17 00:00:00 2001 From: Christophe Serafin Date: Mon, 18 Aug 2014 13:08:09 -0700 Subject: [PATCH] fix _adjustNib2CibSize calls --- AppKit/CPControl.j | 2 +- Tools/nib2cib/NSButton.j | 5 +---- Tools/nib2cib/NSComboBox.j | 9 +-------- Tools/nib2cib/NSControl.j | 11 +++++++++-- Tools/nib2cib/NSDatePicker.j | 9 +-------- Tools/nib2cib/NSImageView.j | 3 +-- Tools/nib2cib/NSLevelIndicator.j | 3 +-- Tools/nib2cib/NSPopUpButton.j | 1 + Tools/nib2cib/NSSearchField.j | 3 +-- Tools/nib2cib/NSSlider.j | 3 +-- Tools/nib2cib/NSStepper.j | 3 +-- Tools/nib2cib/NSTextField.j | 3 +-- 12 files changed, 20 insertions(+), 35 deletions(-) diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j index 2d7b0ca59..c2b1083ce 100644 --- a/AppKit/CPControl.j +++ b/AppKit/CPControl.j @@ -136,7 +136,7 @@ var CPControlBlackColor = [CPColor blackColor]; @"image-scaling": CPScaleToFit, @"min-size": CGSizeMakeZero(), @"max-size": CGSizeMake(-1.0, -1.0), - @"nib2cib-adjustment-frame" : CGRectMakeZero(), + @"nib2cib-adjustment-frame": CGRectMakeZero() }; } diff --git a/Tools/nib2cib/NSButton.j b/Tools/nib2cib/NSButton.j index bab4cc810..4517263fa 100644 --- a/Tools/nib2cib/NSButton.j +++ b/Tools/nib2cib/NSButton.j @@ -170,8 +170,6 @@ var NSButtonIsBorderedMask = 0x00800000, maxSize = [theme valueForAttributeWithName:@"max-size" forClass:[self class]], adjustHeight = NO; - // CPLog.error([self class] + " Frame Adjustment = (" + frameAdjustment.origin.x + ", " + frameAdjustment.origin.y + ", " + frameAdjustment.size.width + ", " + frameAdjustment.size.width + ")") - if (minSize.height > 0 && maxSize.height > 0 && minSize.height === maxSize.height) { adjustHeight = YES; @@ -210,8 +208,6 @@ var NSButtonIsBorderedMask = 0x00800000, _highlightsBy = [cell highlightsBy]; _showsStateBy = [cell showsStateBy]; - - [self _adjustNib2CibSize]; } /*! @@ -398,6 +394,7 @@ var NSButtonIsBorderedMask = 0x00800000, { var cell = [aCoder decodeObjectForKey:@"NSCell"]; [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; } return self; diff --git a/Tools/nib2cib/NSComboBox.j b/Tools/nib2cib/NSComboBox.j index e2c36b18e..835d4f110 100644 --- a/Tools/nib2cib/NSComboBox.j +++ b/Tools/nib2cib/NSComboBox.j @@ -46,14 +46,6 @@ _hasVerticalScroller = [cell hasVerticalScroller]; [self setButtonBordered:[cell borderedButton]]; [self setEnabled:[cell isEnabled]]; - - // Make sure the height is clipped to the max given by the theme - var theme = [Nib2Cib defaultTheme], - maxSize = [theme valueForAttributeWithName:@"max-size" forClass:[CPComboBox class]], - size = [self frameSize], - widthOffset = -3; - - [self _adjustNib2CibSize]; } @end @@ -68,6 +60,7 @@ { var cell = [aCoder decodeObjectForKey:@"NSCell"]; [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; } return self; diff --git a/Tools/nib2cib/NSControl.j b/Tools/nib2cib/NSControl.j index 0cff3a277..f7a8d70d6 100644 --- a/Tools/nib2cib/NSControl.j +++ b/Tools/nib2cib/NSControl.j @@ -69,8 +69,15 @@ - (CGRect)_nib2CibAdjustment { - var theme = [Nib2Cib defaultTheme]; - return [theme valueForAttributeWithName:@"nib2cib-adjustment-frame" inState:[self themeState] forClass:[self class]]; + // Theme has not been loaded yet. + // Get attribute value directly from the theme or from the default value of the object otherwise. + var theme = [Nib2Cib defaultTheme], + frameAdjustment = [theme valueForAttributeWithName:@"nib2cib-adjustment-frame" inState:[self themeState] forClass:[self class]]; + + if (!frameAdjustment) + frameAdjustment = [self currentValueForThemeAttribute:@"nib2cib-adjustment-frame"]; + + return frameAdjustment; } - (void)_adjustNib2CibSize diff --git a/Tools/nib2cib/NSDatePicker.j b/Tools/nib2cib/NSDatePicker.j index c58af623c..d3af0690c 100644 --- a/Tools/nib2cib/NSDatePicker.j +++ b/Tools/nib2cib/NSDatePicker.j @@ -145,12 +145,6 @@ var NSDatePickerDefaultSize = 22, return self; } -- (void)NS_initWithCell:(NSCell)cell -{ - [super NS_initWithCell:cell]; - [self _adjustNib2CibSize]; -} - @end @@ -164,8 +158,7 @@ var NSDatePickerDefaultSize = 22, if (self) { - var cell = [aCoder decodeObjectForKey:@"NSCell"]; - [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; } return self diff --git a/Tools/nib2cib/NSImageView.j b/Tools/nib2cib/NSImageView.j index 13209f40b..909089fdf 100644 --- a/Tools/nib2cib/NSImageView.j +++ b/Tools/nib2cib/NSImageView.j @@ -39,8 +39,6 @@ [self setImageScaling:[cell imageScaling]]; [self setImageAlignment:[cell imageAlignment]]; _isEditable = [cell isEditable]; - - [self _adjustNib2CibSize]; } @end @@ -55,6 +53,7 @@ { var cell = [aCoder decodeObjectForKey:@"NSCell"]; [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; } return self; diff --git a/Tools/nib2cib/NSLevelIndicator.j b/Tools/nib2cib/NSLevelIndicator.j index 732a40b98..deeb106f3 100644 --- a/Tools/nib2cib/NSLevelIndicator.j +++ b/Tools/nib2cib/NSLevelIndicator.j @@ -58,8 +58,6 @@ [self setEditable:[cell isEditable]]; [self setEnabled:[cell isEnabled]]; [self setContinuous:[cell isContinuous]]; - - [self _adjustNib2CibSize]; } @end @@ -76,6 +74,7 @@ { var cell = [aCoder decodeObjectForKey:@"NSCell"]; [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; } return self; diff --git a/Tools/nib2cib/NSPopUpButton.j b/Tools/nib2cib/NSPopUpButton.j index a70936f37..a6a30d4f5 100644 --- a/Tools/nib2cib/NSPopUpButton.j +++ b/Tools/nib2cib/NSPopUpButton.j @@ -56,6 +56,7 @@ { var cell = [aCoder decodeObjectForKey:@"NSCell"]; [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; } return self; diff --git a/Tools/nib2cib/NSSearchField.j b/Tools/nib2cib/NSSearchField.j index 149d874e9..c385ad587 100644 --- a/Tools/nib2cib/NSSearchField.j +++ b/Tools/nib2cib/NSSearchField.j @@ -42,8 +42,6 @@ [self setMaximumRecents:[cell maximumRecents]]; [self setSendsWholeSearchString:[cell sendsWholeSearchString]]; [self setSendsSearchStringImmediately:[cell sendsSearchStringImmediately]]; - - [self _adjustNib2CibSize]; } @end @@ -60,6 +58,7 @@ { var cell = [aCoder decodeObjectForKey:@"NSCell"]; [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; } return self; diff --git a/Tools/nib2cib/NSSlider.j b/Tools/nib2cib/NSSlider.j index 774a32bfd..f7a626960 100644 --- a/Tools/nib2cib/NSSlider.j +++ b/Tools/nib2cib/NSSlider.j @@ -44,8 +44,6 @@ _altIncrementValue = [cell altIncrementValue]; [self setSliderType:[cell sliderType]]; - - [self _adjustNib2CibSize]; } @end @@ -62,6 +60,7 @@ { var cell = [aCoder decodeObjectForKey:@"NSCell"]; [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; var frame = [self frame]; diff --git a/Tools/nib2cib/NSStepper.j b/Tools/nib2cib/NSStepper.j index 0a6cb2781..6a008453a 100644 --- a/Tools/nib2cib/NSStepper.j +++ b/Tools/nib2cib/NSStepper.j @@ -42,8 +42,6 @@ self._valueWraps = [cell valueWraps]; self._autorepeat = [cell autorepeat]; self._objectValue = [cell objectValue]; - - [self _adjustNib2CibSize]; } @end @@ -58,6 +56,7 @@ { var cell = [aCoder decodeObjectForKey:@"NSCell"]; [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; } return self; diff --git a/Tools/nib2cib/NSTextField.j b/Tools/nib2cib/NSTextField.j index e3c0e08b8..711fb8f7e 100644 --- a/Tools/nib2cib/NSTextField.j +++ b/Tools/nib2cib/NSTextField.j @@ -65,8 +65,6 @@ if ([self formatter]) CPLog.debug(">> Formatter: " + [[self formatter] description]); - - [self _adjustNib2CibSize]; } @end @@ -81,6 +79,7 @@ { var cell = [aCoder decodeObjectForKey:@"NSCell"]; [self NS_initWithCell:cell]; + [self _adjustNib2CibSize]; } return self;