diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j index bad76448c..816080f49 100644 --- a/AppKit/CPButton.j +++ b/AppKit/CPButton.j @@ -108,7 +108,7 @@ CPButtonImageOffset = 3.0; // NS-style Display Properties CPBezelStyle _bezelStyle; - CPControlSize _controlSize; +// CPControlSize _controlSize; CPString _keyEquivalent; unsigned _keyEquivalentModifierMask; @@ -189,8 +189,6 @@ CPButtonImageOffset = 3.0; - (void)_init { - _controlSize = CPRegularControlSize; - _keyEquivalent = @""; _keyEquivalentModifierMask = 0; diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j index 5f3260d33..cab43a356 100644 --- a/AppKit/CPControl.j +++ b/AppKit/CPControl.j @@ -193,7 +193,6 @@ var CPControlBlackColor = [CPColor blackColor]; { _sendActionOn = CPLeftMouseUpMask; _trackingMouseDownFlags = 0; - _controlSize = CPRegularControlSize; } return self; @@ -213,7 +212,7 @@ var CPControlBlackColor = [CPColor blackColor]; */ - (void)setControlSize:(CPControlSize)aControlSize { - if (_controlSize == aControlSize) + if (_controlSize === aControlSize) return; [self unsetThemeState:[self controlSizeThemeState]]; diff --git a/AppKit/CPDatePicker/CPDatePicker.j b/AppKit/CPDatePicker/CPDatePicker.j index d7065ddc8..e6a7b08f6 100644 --- a/AppKit/CPDatePicker/CPDatePicker.j +++ b/AppKit/CPDatePicker/CPDatePicker.j @@ -248,12 +248,24 @@ CPEraDatePickerElementFlag = 0x0100; */ - (void)layoutSubviews { + [super layoutSubviews]; if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle) { + var frameSize = [self frameSize], + minSize = [self currentValueForThemeAttribute:@"min-size"]; + + if (minSize.height > 0.0) + { + // Force height + frameSize.height = minSize.height; + [self setFrameSize:frameSize]; + } + [_datePickerTextfield setHidden:NO]; [_datePickerCalendar setHidden:YES]; + [_datePickerTextfield setControlSize:[self controlSize]]; [_datePickerTextfield setNeedsLayout]; } else diff --git a/AppKit/CPDatePicker/_CPDatePickerTextField.j b/AppKit/CPDatePicker/_CPDatePickerTextField.j index 0429c5752..f260ea6c9 100644 --- a/AppKit/CPDatePicker/_CPDatePickerTextField.j +++ b/AppKit/CPDatePicker/_CPDatePickerTextField.j @@ -384,14 +384,16 @@ var CPZeroKeyCode = 48, // Check the mode to display or not the stepper if ([_datePicker datePickerStyle] == CPTextFieldAndStepperDatePickerStyle) { - frameSize = CGSizeMake(CGRectGetWidth([_datePicker frame]) - CGRectGetWidth([_stepper frame]) - [_datePicker valueForThemeAttribute:@"stepper-margin"], CGRectGetHeight([_datePicker frame])); + [_stepper setHidden:NO]; + [_stepper setControlSize:[_datePicker controlSize]]; + + frameSize = CGSizeMake(CGRectGetWidth([_datePicker frame]) - CGRectGetWidth([_stepper frame]) - [_datePicker currentValueForThemeAttribute:@"stepper-margin"], CGRectGetHeight([_datePicker frame])); frameSize.width -= bezelInset.left; frameSize.height -= bezelInset.top + bezelInset.bottom; [_datePickerElementView setFrameSize:frameSize]; [_datePickerElementView setFrameOrigin:CGPointMake(bezelInset.left, bezelInset.top)]; - [_stepper setHidden:NO]; } else if ([_datePicker datePickerStyle] == CPTextFieldDatePickerStyle) { @@ -405,7 +407,9 @@ var CPZeroKeyCode = 48, [_stepper setHidden:YES]; } - [_stepper setFrameOrigin:CGPointMake(CGRectGetMaxX([_datePickerElementView frame]) + [_datePicker valueForThemeAttribute:@"stepper-margin"], bezelInset.top + CGRectGetHeight([_datePickerElementView frame]) / 2 - CGRectGetHeight([_stepper frame]) / 2)]; + [_stepper setFrameOrigin:CGPointMake(CGRectGetMaxX([_datePickerElementView frame]) + [_datePicker currentValueForThemeAttribute:@"stepper-margin"], bezelInset.top + CGRectGetHeight([_datePickerElementView frame]) / 2 - CGRectGetHeight([_stepper frame]) / 2)]; + + [_datePickerElementView setControlSize:[_datePicker controlSize]]; [_datePickerElementView setNeedsLayout]; } @@ -702,6 +706,7 @@ var CPZeroKeyCode = 48, [self _updateResponderTextField]; [self _updateHiddenTextFields]; + [self _setControlSizes]; [self _sizeToFit]; [self _updatePositions]; @@ -738,7 +743,7 @@ var CPZeroKeyCode = 48, */ - (void)_themeTextFields { - [_textFieldDay setValue:[_datePicker valueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; + [_textFieldDay setValue:[_datePicker currentValueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; [_textFieldDay setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateNormal] forThemeAttribute:@"content-inset" inState:CPThemeStateNormal]; [_textFieldDay setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateSelected] forThemeAttribute:@"content-inset" inState:CPThemeStateSelected]; [_textFieldDay setValue:[_datePicker valueForThemeAttribute:@"datepicker-textfield-bezel-color" inState:CPThemeStateSelected] forThemeAttribute:@"bezel-color" inState:CPThemeStateSelected]; @@ -757,7 +762,7 @@ var CPZeroKeyCode = 48, [_textFieldDay setValue:[_datePicker valueForThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled]; [_textFieldDay setValue:[_datePicker valueForThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled]; - [_textFieldMonth setValue:[_datePicker valueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; + [_textFieldMonth setValue:[_datePicker currentValueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; [_textFieldMonth setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateNormal] forThemeAttribute:@"content-inset" inState:CPThemeStateNormal]; [_textFieldMonth setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateSelected] forThemeAttribute:@"content-inset" inState:CPThemeStateSelected]; [_textFieldMonth setValue:[_datePicker valueForThemeAttribute:@"datepicker-textfield-bezel-color" inState:CPThemeStateSelected] forThemeAttribute:@"bezel-color" inState:CPThemeStateSelected]; @@ -776,7 +781,7 @@ var CPZeroKeyCode = 48, [_textFieldMonth setValue:[_datePicker valueForThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled]; [_textFieldMonth setValue:[_datePicker valueForThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled]; - [_textFieldYear setValue:[_datePicker valueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; + [_textFieldYear setValue:[_datePicker currentValueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; [_textFieldYear setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateNormal] forThemeAttribute:@"content-inset" inState:CPThemeStateNormal]; [_textFieldYear setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateSelected] forThemeAttribute:@"content-inset" inState:CPThemeStateSelected]; [_textFieldYear setValue:[_datePicker valueForThemeAttribute:@"datepicker-textfield-bezel-color" inState:CPThemeStateSelected] forThemeAttribute:@"bezel-color" inState:CPThemeStateSelected]; @@ -795,7 +800,7 @@ var CPZeroKeyCode = 48, [_textFieldYear setValue:[_datePicker valueForThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled]; [_textFieldYear setValue:[_datePicker valueForThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled]; - [_textFieldHour setValue:[_datePicker valueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; + [_textFieldHour setValue:[_datePicker currentValueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; [_textFieldHour setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateNormal] forThemeAttribute:@"content-inset" inState:CPThemeStateNormal]; [_textFieldHour setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateSelected] forThemeAttribute:@"content-inset" inState:CPThemeStateSelected]; [_textFieldHour setValue:[_datePicker valueForThemeAttribute:@"datepicker-textfield-bezel-color" inState:CPThemeStateSelected] forThemeAttribute:@"bezel-color" inState:CPThemeStateSelected]; @@ -814,7 +819,7 @@ var CPZeroKeyCode = 48, [_textFieldHour setValue:[_datePicker valueForThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled]; [_textFieldHour setValue:[_datePicker valueForThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled]; - [_textFieldMinute setValue:[_datePicker valueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; + [_textFieldMinute setValue:[_datePicker currentValueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; [_textFieldMinute setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateNormal] forThemeAttribute:@"content-inset" inState:CPThemeStateNormal]; [_textFieldMinute setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateSelected] forThemeAttribute:@"content-inset" inState:CPThemeStateSelected]; [_textFieldMinute setValue:[_datePicker valueForThemeAttribute:@"datepicker-textfield-bezel-color" inState:CPThemeStateSelected] forThemeAttribute:@"bezel-color" inState:CPThemeStateSelected]; @@ -833,7 +838,7 @@ var CPZeroKeyCode = 48, [_textFieldMinute setValue:[_datePicker valueForThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled]; [_textFieldMinute setValue:[_datePicker valueForThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled]; - [_textFieldSecond setValue:[_datePicker valueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; + [_textFieldSecond setValue:[_datePicker currentValueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; [_textFieldSecond setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateNormal] forThemeAttribute:@"content-inset" inState:CPThemeStateNormal]; [_textFieldSecond setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateSelected] forThemeAttribute:@"content-inset" inState:CPThemeStateSelected]; [_textFieldSecond setValue:[_datePicker valueForThemeAttribute:@"datepicker-textfield-bezel-color" inState:CPThemeStateSelected] forThemeAttribute:@"bezel-color" inState:CPThemeStateSelected]; @@ -852,7 +857,7 @@ var CPZeroKeyCode = 48, [_textFieldSecond setValue:[_datePicker valueForThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled]; [_textFieldSecond setValue:[_datePicker valueForThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled]; - [_textFieldPMAM setValue:[_datePicker valueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; + [_textFieldPMAM setValue:[_datePicker currentValueForThemeAttribute:@"min-size-datepicker-textfield"] forThemeAttribute:@"min-size"]; [_textFieldPMAM setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateNormal] forThemeAttribute:@"content-inset" inState:CPThemeStateNormal]; [_textFieldPMAM setValue:[_datePicker valueForThemeAttribute:@"content-inset-datepicker-textfield" inState:CPThemeStateSelected] forThemeAttribute:@"content-inset" inState:CPThemeStateSelected]; [_textFieldPMAM setValue:[_datePicker valueForThemeAttribute:@"datepicker-textfield-bezel-color" inState:CPThemeStateSelected] forThemeAttribute:@"bezel-color" inState:CPThemeStateSelected]; @@ -1013,7 +1018,7 @@ var CPZeroKeyCode = 48, if ([_textFieldMonth isHidden]) [_textFieldHour setFrameOrigin:CGPointMake(horizontalInset, verticalInset)]; else - [_textFieldHour setFrameOrigin:CGPointMake(CGRectGetMaxX([_textFieldYear frame]) + [_datePicker valueForThemeAttribute:@"date-hour-margin"],verticalInset)]; + [_textFieldHour setFrameOrigin:CGPointMake(CGRectGetMaxX([_textFieldYear frame]) + [_datePicker currentValueForThemeAttribute:@"date-hour-margin"], verticalInset)]; [_textFieldSeparatorThree setFrameOrigin:CGPointMake(CGRectGetMaxX([_textFieldHour frame]) + separatorContentInset.left, verticalInset)]; [_textFieldMinute setFrameOrigin:CGPointMake(CGRectGetMaxX([_textFieldSeparatorThree frame]) + separatorContentInset.right, verticalInset)]; @@ -1043,6 +1048,23 @@ var CPZeroKeyCode = 48, [_textFieldPMAM sizeToFit]; } +/*! Size to fit all of the textFields +*/ +- (void)_setControlSizes +{ + [_textFieldDay setControlSize:[_datePicker controlSize]]; + [_textFieldMonth setControlSize:[_datePicker controlSize]]; + [_textFieldYear setControlSize:[_datePicker controlSize]]; + [_textFieldHour setControlSize:[_datePicker controlSize]]; + [_textFieldMinute setControlSize:[_datePicker controlSize]]; + [_textFieldSecond setControlSize:[_datePicker controlSize]]; + [_textFieldSeparatorOne setControlSize:[_datePicker controlSize]]; + [_textFieldSeparatorTwo setControlSize:[_datePicker controlSize]]; + [_textFieldSeparatorThree setControlSize:[_datePicker controlSize]]; + [_textFieldSeparatorFour setControlSize:[_datePicker controlSize]]; + [_textFieldPMAM setControlSize:[_datePicker controlSize]]; +} + #pragma mark - #pragma mark Responder methods diff --git a/AppKit/CPFont.j b/AppKit/CPFont.j index c9d53ebe2..24e8190cd 100644 --- a/AppKit/CPFont.j +++ b/AppKit/CPFont.j @@ -174,20 +174,20 @@ following: return _CPFontSystemFontSize; } -+ (float)systemFontSizeForControlSize:(CPControlSize)aSize ++ (CPFont)systemFontForControlSize:(CPControlSize)aSize { // TODO These sizes should be themable or made less arbitrary in some other way. switch (aSize) { case CPSmallControlSize: - return _CPFontSystemFontSize - 1; + return [self systemFontOfSize:_CPFontSystemFontSize - 1]; case CPMiniControlSize: - return _CPFontSystemFontSize - 2; + return [self systemFontOfSize:_CPFontSystemFontSize - 2]; case CPRegularControlSize: default: - return _CPFontSystemFontSize; + return [self systemFontOfSize:_CPFontSystemFontSize]; } } diff --git a/AppKit/CPStepper.j b/AppKit/CPStepper.j index c7b8e304e..758e6833c 100644 --- a/AppKit/CPStepper.j +++ b/AppKit/CPStepper.j @@ -138,9 +138,16 @@ [self setContinuous:_autorepeat]; [self addSubview:_buttonDown]; + [self _sizeToFit]; [self setNeedsLayout]; } +- (void)setControlSize:(CPControlSize)aControlSize +{ + [super setControlSize:aControlSize]; + [self _sizeToFit]; +} + #pragma mark - #pragma mark Superclass overrides @@ -159,8 +166,8 @@ - (void)setFrame:(CGRect)aFrame { - var upSize = [self valueForThemeAttribute:@"up-button-size"], - downSize = [self valueForThemeAttribute:@"down-button-size"], + var upSize = [self currentValueForThemeAttribute:@"up-button-size"], + downSize = [self currentValueForThemeAttribute:@"down-button-size"], minSize = CGSizeMake(upSize.width, upSize.height + downSize.height), frame = CGRectMakeCopy(aFrame); @@ -176,18 +183,18 @@ aFrame = [self frame], upSize = [self valueForThemeAttribute:@"up-button-size" inState:controlSizeThemeState], downSize = [self valueForThemeAttribute:@"down-button-size" inState:controlSizeThemeState], - upFrame = CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height), - downFrame = CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height); + upFrame = CGRectMake(0, 0, upSize.width, upSize.height), + downFrame = CGRectMake(0, upSize.height, downSize.width, downSize.height); - [_buttonUp setFrame:upFrame]; - [_buttonDown setFrame:downFrame]; + [_buttonUp setFrame:upFrame]; + [_buttonDown setFrame:downFrame]; - [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered]; - [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateDisabled]]; - [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateHighlighted]]; - [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered]; - [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateDisabled]]; - [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateHighlighted]]; + [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered]; + [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateDisabled]]; + [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateHighlighted]]; + [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered]; + [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateDisabled]]; + [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateHighlighted]]; } - (void)_sizeToFit diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j index 5b6848bbd..ac9140509 100644 --- a/AppKit/CPTextField.j +++ b/AppKit/CPTextField.j @@ -141,7 +141,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder"); // NS-style Display Properties CPTextFieldBezelStyle _bezelStyle; BOOL _isBordered; - CPControlSize _controlSize; } + (Class)_binderClassForBinding:(CPString)aBinding @@ -228,6 +227,22 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder"); }; } +- (void)setControlSize:(CPControlSize)aControlSize +{ + [super setControlSize:aControlSize]; + + var frameSize = [self frameSize], + maxSize = [self currentValueForThemeAttribute:@"max-size"], + font = [self currentValueForThemeAttribute:@"font"]; + + if (maxSize.height > 0) + frameSize.height = maxSize.height; + + [self setFrameSize:frameSize]; + [self setFont:[CPFont systemFontForControlSize:[self controlSize]]]; +} + + #if PLATFORM(DOM) - (DOMElement)_inputElement { diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-button-add-image.png b/AppKit/Themes/Aristo2/Resources/rule-editor-button-add-image.png new file mode 100644 index 000000000..c223c965b Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-button-add-image.png differ diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-button-remove-image.png b/AppKit/Themes/Aristo2/Resources/rule-editor-button-remove-image.png new file mode 100644 index 000000000..f99f803e3 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-button-remove-image.png differ diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-center.png b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-center.png new file mode 100644 index 000000000..96d845df1 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-center.png new file mode 100644 index 000000000..379c5dafc Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-left.png new file mode 100644 index 000000000..2d867b43c Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-right-pullsdown.png b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-right-pullsdown.png new file mode 100644 index 000000000..38ec0ec5e Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-right-pullsdown.png differ diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-right.png new file mode 100644 index 000000000..443c4ed54 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-left.png b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-left.png new file mode 100644 index 000000000..dd8a32906 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-right-pullsdown.png b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-right-pullsdown.png new file mode 100644 index 000000000..ec8121402 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-right-pullsdown.png differ diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-right.png b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-right.png new file mode 100644 index 000000000..3175cdc7b Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/rule-editor-popup-bezel-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-down-center.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-down-center.png new file mode 100755 index 000000000..d87fad90a Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-down-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-down-left.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-down-left.png new file mode 100644 index 000000000..bb82579db Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-down-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-down-right.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-down-right.png new file mode 100644 index 000000000..21d184274 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-down-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-up-center.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-up-center.png new file mode 100755 index 000000000..2e7e92fd1 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-up-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-up-left.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-up-left.png new file mode 100644 index 000000000..271823ad8 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-up-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-up-right.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-up-right.png new file mode 100644 index 000000000..9b35ad5d7 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-disabled-up-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-down-center.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-down-center.png new file mode 100644 index 000000000..3bb74409b Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-down-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-down-left.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-down-left.png new file mode 100644 index 000000000..0ea4d1cba Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-down-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-down-right.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-down-right.png new file mode 100644 index 000000000..cc918547c Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-down-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-down-center.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-down-center.png new file mode 100644 index 000000000..8055acf22 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-down-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-down-left.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-down-left.png new file mode 100644 index 000000000..babc10347 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-down-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-down-right.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-down-right.png new file mode 100644 index 000000000..38a7b897a Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-down-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-up-center.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-up-center.png new file mode 100644 index 000000000..6c2bda6ab Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-up-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-up-left.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-up-left.png new file mode 100644 index 000000000..0a0357223 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-up-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-up-right.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-up-right.png new file mode 100644 index 000000000..01cd4df82 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-highlighted-up-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-up-center.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-up-center.png new file mode 100644 index 000000000..722aa07a3 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-up-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-up-left.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-up-left.png new file mode 100644 index 000000000..561e71357 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-up-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-up-right.png b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-up-right.png new file mode 100644 index 000000000..b5c917adb Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/stepper-bezel-small-up-right.png differ diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index b0e9d7d03..3d626cc2e 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -543,12 +543,21 @@ var themedButtonValues = nil, [@"bezel-color", bezelColor["@"], CPThemeStateBezeled], [@"bezel-color", bezelFocusedColor, [CPThemeStateBezeled, CPThemeStateEditing]], [@"bezel-color", bezelColor["disabled"], [CPThemeStateBezeled, CPThemeStateDisabled]], - [@"font", [CPFont systemFontOfSize:CPFontCurrentSystemSize], CPThemeStateBezeled], + + [@"font", [CPFont systemFontOfSize:12.0], CPThemeStateBezeled], + [@"font", [CPFont systemFontOfSize:11.0], CPThemeStateControlSizeSmall],// TODO-CS : to remove + [@"font", [CPFont systemFontOfSize:8.0], CPThemeStateControlSizeMini],// TODO-CS : to remove + [@"text-color", regularDisabledTextColor, [CPThemeStateBezeled, CPThemeStateDisabled]], [@"text-shadow-color", regularDisabledTextShadowColor, [CPThemeStateBezeled, CPThemeStateDisabled]], [@"content-inset", CGInsetMake(8.0, 7.0, 5.0, 10.0), CPThemeStateBezeled], [@"content-inset", CGInsetMake(8.0, 7.0, 5.0, 10.0), [CPThemeStateBezeled, CPThemeStateEditing]], + [@"content-inset", CGInsetMake(7.0, 7.0, 5.0, 8.0), [CPThemeStateControlSizeSmall, CPThemeStateBezeled]], + [@"content-inset", CGInsetMake(7.0, 7.0, 5.0, 8.0), [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPThemeStateEditing]], + [@"content-inset", CGInsetMake(6.0, 7.0, 5.0, 7.0), [CPThemeStateControlSizeMini, CPThemeStateBezeled]], + [@"content-inset", CGInsetMake(6.0, 7.0, 5.0, 7.0), [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPThemeStateEditing]], + [@"bezel-inset", CGInsetMake(3.0, 4.0, 3.0, 4.0), CPThemeStateBezeled], [@"bezel-inset", CGInsetMake(0.0, 1.0, 0.0, 1.0), [CPThemeStateBezeled, CPThemeStateEditing]], @@ -572,7 +581,11 @@ var themedButtonValues = nil, [@"text-shadow-color", [CPColor whiteColor], [CPThemeStateTableDataView, CPThemeStateGroupRow]], [@"text-shadow-offset", CGSizeMake(0, 1), [CPThemeStateTableDataView, CPThemeStateGroupRow]], [@"text-shadow-color", [CPColor colorWithCalibratedWhite:0.0 alpha:0.6], [CPThemeStateTableDataView, CPThemeStateGroupRow, CPThemeStateSelectedDataView, CPThemeStateFirstResponder, CPThemeStateKeyWindow]], - [@"font", [CPFont boldSystemFontOfSize:CPFontCurrentSystemSize], [CPThemeStateTableDataView, CPThemeStateGroupRow]] + [@"font", [CPFont boldSystemFontOfSize:CPFontCurrentSystemSize], [CPThemeStateTableDataView, CPThemeStateGroupRow]], + + + [@"max-size", CGSizeMake(-1.0, 25.0), CPThemeStateControlSizeSmall], + [@"max-size", CGSizeMake(-1.0, 22.0), CPThemeStateControlSizeMini] ]; [self registerThemeValues:themedTextFieldValues forView:textfield]; @@ -615,7 +628,9 @@ var themedButtonValues = nil, bezelFocusedColor, [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]], [@"bezel-color", bezelColor["disabled"], [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateDisabled]], - [@"font", [CPFont systemFontOfSize:12.0]], + [@"font", [CPFont systemFontOfSize:CPFontCurrentSystemSize]], + [@"font", [CPFont systemFontOfSize:11.0], CPThemeStateControlSizeSmall],// TODO-CS : to remove + [@"font", [CPFont systemFontOfSize:8.0], CPThemeStateControlSizeMini],// TODO-CS : to remove [@"content-inset", CGInsetMake(8.0, 14.0, 6.0, 14.0), [CPTextFieldStateRounded, CPThemeStateBezeled]], [@"content-inset", CGInsetMake(8.0, 14.0, 6.0, 14.0), [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]], @@ -628,7 +643,10 @@ var themedButtonValues = nil, [@"text-shadow-color", regularDisabledTextShadowColor, [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateDisabled]], [@"min-size", CGSizeMake(0.0, 29.0), [CPTextFieldStateRounded, CPThemeStateBezeled]], - [@"max-size", CGSizeMake(-1.0, 29.0), [CPTextFieldStateRounded, CPThemeStateBezeled]] + [@"max-size", CGSizeMake(-1.0, 29.0), [CPTextFieldStateRounded, CPThemeStateBezeled]], + + [@"min-size", CGSizeMake(0.0, 20.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]], + [@"max-size", CGSizeMake(-1.0, 20.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]] ]; [self registerThemeValues:themedRoundedTextFieldValues forView:textfield]; @@ -667,7 +685,7 @@ var themedButtonValues = nil, + (CPDatePicker)themedDatePicker { - var datePicker = [[CPDatePicker alloc] initWithFrame:CGRectMake(40.0 ,40.0 ,170.0 ,29.0)], + var datePicker = [[CPDatePicker alloc] initWithFrame:CGRectMake(40.0, 40.0, 170.0, 29.0)], bezelColor = PatternColor( "textfield-bezel-square{state}{position}.png", @@ -687,23 +705,27 @@ var themedButtonValues = nil, themeValues = [ - [@"bezel-color", bezelColor["@"], CPThemeStateBezeled], - [@"bezel-color", bezelColor["disabled"], [CPThemeStateBezeled, CPThemeStateDisabled]], + [@"bezel-color", bezelColor["@"], CPThemeStateBezeled], + [@"bezel-color", bezelColor["disabled"], [CPThemeStateBezeled, CPThemeStateDisabled]], + + [@"font", [CPFont systemFontOfSize:CPFontCurrentSystemSize]], - [@"font", [CPFont boldSystemFontOfSize:13.0]], [@"text-color", [CPColor colorWithWhite:0.2 alpha:0.8]], - [@"text-color", [CPColor colorWithWhite:0.2 alpha:0.5], CPThemeStateDisabled], + [@"text-color", [CPColor colorWithWhite:0.2 alpha:0.5], CPThemeStateDisabled], - [@"content-inset", CGInsetMake(6.0, 0.0, 0.0, 3.0), CPThemeStateNormal], - [@"content-inset", CGInsetMake(3.0, 0.0, 0.0, 3.0), CPThemeStateBezeled], - [@"bezel-inset", CGInsetMake(3.0, 0.0, 3.0, 0.0), CPThemeStateBezeled], + [@"content-inset", CGInsetMake(6.0, 0.0, 0.0, 3.0), CPThemeStateNormal], + [@"content-inset", CGInsetMake(3.0, 0.0, 0.0, 3.0), CPThemeStateBezeled], - [@"datepicker-textfield-bezel-color", [CPColor clearColor], CPThemeStateNormal], - [@"datepicker-textfield-bezel-color", bezelColorDatePickerTextField, CPThemeStateSelected], - [@"datepicker-textfield-bezel-color", [CPColor clearColor], [CPThemeStateNormal, CPThemeStateDisabled]], - [@"datepicker-textfield-bezel-color", [CPColor clearColor], [CPThemeStateSelected, CPThemeStateDisabled]], + [@"bezel-inset", CGInsetMake(3.0, 0.0, 3.0, 0.0), CPThemeStateBezeled], + + [@"datepicker-textfield-bezel-color", [CPColor clearColor], CPThemeStateNormal], + [@"datepicker-textfield-bezel-color", bezelColorDatePickerTextField, CPThemeStateSelected], + [@"datepicker-textfield-bezel-color", [CPColor clearColor], [CPThemeStateNormal, CPThemeStateDisabled]], + [@"datepicker-textfield-bezel-color", [CPColor clearColor], [CPThemeStateSelected, CPThemeStateDisabled]], [@"min-size-datepicker-textfield", CGSizeMake(6.0, 18.0)], + [@"min-size-datepicker-textfield", CGSizeMake(6.0, 16.0), CPThemeStateControlSizeSmall], + [@"min-size-datepicker-textfield", CGSizeMake(6.0, 12.0), CPThemeStateControlSizeMini], [@"separator-content-inset", CGInsetMake(0.0, -2.0, 0.0, -1.0)], @@ -713,10 +735,19 @@ var themedButtonValues = nil, [@"content-inset-datepicker-textfield-separator",CGInsetMake(2.0, 0.0, 0.0, 0.0), CPThemeStateSelected], [@"date-hour-margin", 7.0], - [@"stepper-margin", 5.0], + [@"date-hour-margin", 5.0, CPThemeStateControlSizeSmall], + [@"date-hour-margin", 2.0, CPThemeStateControlSizeMini], - [@"min-size", CGSizeMake(0.0, 29.0)], - [@"max-size", CGSizeMake(-1.0, 29.0)] + [@"stepper-margin", 5.0], + [@"stepper-margin", 3.0, CPThemeStateControlSizeSmall], + [@"stepper-margin", 2.0, CPThemeStateControlSizeMini], + + [@"min-size", CGSizeMake(0, 29.0)], + [@"max-size", CGSizeMake(-1.0, 29.0)], + [@"min-size", CGSizeMake(0, 25.0), CPThemeStateControlSizeSmall], + [@"max-size", CGSizeMake(-1.0, 25.0), CPThemeStateControlSizeSmall], + [@"min-size", CGSizeMake(0, 22.0), CPThemeStateControlSizeMini], + [@"max-size", CGSizeMake(-1.0, 22.0), CPThemeStateControlSizeMini] ]; [datePicker setDatePickerStyle:CPTextFieldDatePickerStyle]; @@ -1704,6 +1735,26 @@ var themedButtonValues = nil, orientation: PatternIsHorizontal }), + smallBezelUp = PatternColor( + "stepper-bezel-small{state}-up{position}.png", + { + states: ["", "highlighted", "disabled"], + width: 3.0, + height: 11.0, + centerWidth: 14.0, + orientation: PatternIsHorizontal + }), + + smallBezelDown = PatternColor( + "stepper-bezel-small{state}-down{position}.png", + { + states: ["", "highlighted", "disabled"], + width: 3.0, + height: 10.0, + centerWidth: 14.0, + orientation: PatternIsHorizontal + }), + miniBezelUp = PatternColor( "stepper-bezel-mini{state}-up{position}.png", { @@ -1733,20 +1784,33 @@ var themedButtonValues = nil, [@"bezel-color-down-button", regularBezelDown["disabled"], [CPThemeStateBordered, CPThemeStateDisabled]], [@"bezel-color-up-button", regularBezelUp["highlighted"], [CPThemeStateBordered, CPThemeStateHighlighted]], [@"bezel-color-down-button", regularBezelDown["highlighted"], [CPThemeStateBordered, CPThemeStateHighlighted]], - [@"min-size", CGSizeMake(25.0, 25.0)], + + [@"min-size", CGSizeMake(25.0, 25.0)], // TODO-CS : to remove [@"up-button-size", CGSizeMake(25.0, 13.0)], [@"down-button-size", CGSizeMake(25.0, 12.0)], + // CPThemeStateControlSizeSmall + [@"bezel-color-up-button", smallBezelUp["@"], [CPThemeStateControlSizeSmall, CPThemeStateBordered]], + [@"bezel-color-down-button", smallBezelDown["@"], [CPThemeStateControlSizeSmall, CPThemeStateBordered]], + [@"bezel-color-up-button", smallBezelUp["disabled"], [CPThemeStateControlSizeSmall, CPThemeStateBordered, CPThemeStateDisabled]], + [@"bezel-color-down-button", smallBezelDown["disabled"], [CPThemeStateControlSizeSmall, CPThemeStateBordered, CPThemeStateDisabled]], + [@"bezel-color-up-button", smallBezelUp["highlighted"], [CPThemeStateControlSizeSmall, CPThemeStateBordered, CPThemeStateHighlighted]], + [@"bezel-color-down-button", smallBezelDown["highlighted"], [CPThemeStateControlSizeSmall, CPThemeStateBordered, CPThemeStateHighlighted]], + + [@"up-button-size", CGSizeMake(20.0, 11.0), CPThemeStateControlSizeSmall], + [@"down-button-size", CGSizeMake(20.0, 10.0), CPThemeStateControlSizeSmall], + // CPThemeStateControlSizeMini - [@"bezel-color-up-button", miniBezelUp["@"], [CPThemeStateControlSizeMini, CPThemeStateBordered]], - [@"bezel-color-down-button", miniBezelDown["@"], [CPThemeStateControlSizeMini, CPThemeStateBordered]], - [@"bezel-color-up-button", miniBezelUp["disabled"], [CPThemeStateControlSizeMini, CPThemeStateBordered, CPThemeStateDisabled]], - [@"bezel-color-down-button", miniBezelDown["disabled"], [CPThemeStateControlSizeMini, CPThemeStateBordered, CPThemeStateDisabled]], - [@"bezel-color-up-button", miniBezelUp["highlighted"], [CPThemeStateControlSizeMini, CPThemeStateBordered, CPThemeStateHighlighted]], - [@"bezel-color-down-button", miniBezelDown["highlighted"], [CPThemeStateControlSizeMini, CPThemeStateBordered, CPThemeStateHighlighted]], - [@"min-size", CGSizeMake(14.0, 16.0), CPThemeStateControlSizeMini], - [@"up-button-size", CGSizeMake(14.0, 8.0), CPThemeStateControlSizeMini], - [@"down-button-size", CGSizeMake(14.0, 7.0), CPThemeStateControlSizeMini] + [@"bezel-color-up-button", miniBezelUp["@"], [CPThemeStateControlSizeMini, CPThemeStateBordered]], + [@"bezel-color-down-button", miniBezelDown["@"], [CPThemeStateControlSizeMini, CPThemeStateBordered]], + [@"bezel-color-up-button", miniBezelUp["disabled"], [CPThemeStateControlSizeMini, CPThemeStateBordered, CPThemeStateDisabled]], + [@"bezel-color-down-button", miniBezelDown["disabled"], [CPThemeStateControlSizeMini, CPThemeStateBordered, CPThemeStateDisabled]], + [@"bezel-color-up-button", miniBezelUp["highlighted"], [CPThemeStateControlSizeMini, CPThemeStateBordered, CPThemeStateHighlighted]], + [@"bezel-color-down-button", miniBezelDown["highlighted"], [CPThemeStateControlSizeMini, CPThemeStateBordered, CPThemeStateHighlighted]], + + [@"min-size", CGSizeMake(14.0, 16.0), CPThemeStateControlSizeMini], // TODO-CS : to remove + [@"up-button-size", CGSizeMake(14.0, 8.0), CPThemeStateControlSizeMini], + [@"down-button-size", CGSizeMake(14.0, 7.0), CPThemeStateControlSizeMini] ]; [self registerThemeValues:themeValues forView:stepper]; diff --git a/Tools/nib2cib/NSButton.j b/Tools/nib2cib/NSButton.j index 2f0531138..0fe0354fe 100644 --- a/Tools/nib2cib/NSButton.j +++ b/Tools/nib2cib/NSButton.j @@ -111,7 +111,6 @@ var NSButtonIsBorderedMask = 0x00800000, _title = [cell title]; _alternateTitle = [cell alternateTitle]; - _controlSize = CPRegularControlSize; [self setBordered:[cell isBordered]]; _bezelStyle = [cell bezelStyle]; diff --git a/Tools/nib2cib/NSControl.j b/Tools/nib2cib/NSControl.j index 548e2f68d..0c1211b02 100644 --- a/Tools/nib2cib/NSControl.j +++ b/Tools/nib2cib/NSControl.j @@ -54,6 +54,7 @@ - (void)NS_initWithCell:(NSCell)cell { + [self setSendsActionOnEndEditing:[cell sendsActionOnEndEditing]]; [self setObjectValue:[cell objectValue]]; [self setFont:[cell font]]; @@ -61,6 +62,7 @@ [self setContinuous:[cell isContinuous]]; [self setLineBreakMode:[cell lineBreakMode]]; [self setFormatter:[cell formatter]]; + [self setControlSize:[cell controlSize]]; } @end diff --git a/Tools/nib2cib/NSDatePicker.j b/Tools/nib2cib/NSDatePicker.j index 5a89f8f26..0d4d698a7 100644 --- a/Tools/nib2cib/NSDatePicker.j +++ b/Tools/nib2cib/NSDatePicker.j @@ -59,6 +59,7 @@ var NSDatePickerDefaultSize = 22, [self setBezeled:[cell isBezeled]]; [self setBordered:[cell isBordered]]; [self setEnabled:[cell isEnabled]]; + [self setControlSize:[cell controlSize]]; var theme = [Nib2Cib defaultTheme];