mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-19 21:19:24 +00:00
Buttons fixes
This commit is contained in:
1 parent
ec238f2cc3
commit
3a18574838
1 file changed
+10
-9
@@ -793,6 +793,7 @@ var themedButtonValues = nil,
|
||||
[@"image-color", A3CPColorBlack85, [CPButtonStateBezelStyleSmallSquare, CPThemeStateHighlighted]],
|
||||
[@"image-color", A3CPColorBlack25, [CPButtonStateBezelStyleSmallSquare, CPThemeStateDisabled]],
|
||||
[@"image-offset", 1.0, CPButtonStateBezelStyleSmallSquare],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(1.0, 1.0, 0.0, 0.0), CPButtonStateBezelStyleSmallSquare],
|
||||
|
||||
// IB Style : Push (CPButtonStateBezelStyleRounded) - Bordered
|
||||
[@"bezel-color", buttonCssColor, [CPButtonStateBezelStyleRounded, CPThemeStateBordered]],
|
||||
@@ -1694,7 +1695,7 @@ var themedButtonValues = nil,
|
||||
[@"bezel-color", nbHighlightedButtonCssColor, [CPButtonStateBezelStyleRegularSquare, CPThemeStateHighlighted]],
|
||||
[@"bezel-color", nbDisabledButtonCssColor, [CPButtonStateBezelStyleRegularSquare, CPThemeStateDisabled]],
|
||||
[@"bezel-color", nbDisabledButtonCssColor, [CPButtonStateBezelStyleRegularSquare, CPThemeStateDisabled, CPThemeStateKeyWindow]],
|
||||
[@"content-inset", CGInsetMake(-3.0, 13, 0, 2.0), [CPButtonStateBezelStyleRegularSquare]], // was (-3.0, 22.0 + 5.0, 0, 8.0)
|
||||
[@"content-inset", CGInsetMake(2.0, 10, 1.0, 10.0), [CPButtonStateBezelStyleRegularSquare]], // was (-3.0, 22.0 + 5.0, 0, 8.0)
|
||||
[@"min-size", CGSizeMake(32.0, 21.0), [CPButtonStateBezelStyleRegularSquare]],
|
||||
[@"max-size", CGSizeMake(-1.0, 21.0), [CPButtonStateBezelStyleRegularSquare]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(0.0, -0.0, -0.0, -0.0), [CPButtonStateBezelStyleRegularSquare]],
|
||||
@@ -1705,7 +1706,7 @@ var themedButtonValues = nil,
|
||||
[@"bezel-color", nbSmallHighlightedButtonCssColor, [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall, CPThemeStateHighlighted]],
|
||||
[@"bezel-color", nbSmallDisabledButtonCssColor, [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall, CPThemeStateDisabled]],
|
||||
[@"bezel-color", nbSmallDisabledButtonCssColor, [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall, CPThemeStateDisabled, CPThemeStateKeyWindow]],
|
||||
[@"content-inset", CGInsetMake(-3.0, 13, 0, 2.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
[@"content-inset", CGInsetMake(1.0, 8, 1.0, 10.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
[@"min-size", CGSizeMake(32.0, 18.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
[@"max-size", CGSizeMake(-1.0, 18.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(0.0, -0.0, -0.0, -0.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
@@ -1716,7 +1717,7 @@ var themedButtonValues = nil,
|
||||
[@"bezel-color", nbMiniHighlightedButtonCssColor, [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini, CPThemeStateHighlighted]],
|
||||
[@"bezel-color", nbMiniDisabledButtonCssColor, [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini, CPThemeStateDisabled]],
|
||||
[@"bezel-color", nbMiniDisabledButtonCssColor, [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini, CPThemeStateDisabled, CPThemeStateKeyWindow]],
|
||||
[@"content-inset", CGInsetMake(-3.0, 13, 0, 2.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]],
|
||||
[@"content-inset", CGInsetMake(2.0, 10, 1.0, 10.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]],
|
||||
[@"min-size", CGSizeMake(32.0, 16.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]],
|
||||
[@"max-size", CGSizeMake(-1.0, 16.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(0.0, -0.0, -0.0, -0.0), [CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]]
|
||||
@@ -2371,8 +2372,8 @@ var themedButtonValues = nil,
|
||||
[@"bezel-color", nbHighlightedButtonCssColor, [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateKeyWindow, CPThemeStateHighlighted]],
|
||||
[@"bezel-color", nbDisabledButtonCssColor, [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateDisabled]],
|
||||
[@"bezel-color", nbDisabledButtonCssColor, [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateDisabled, CPThemeStateKeyWindow]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(0.0, 0.0, 0.0, 0.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare]],
|
||||
[@"content-inset", CGInsetMake(-3.0, 13, 0, 2.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(1.0, 1.0, 0.0, 0.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare]],
|
||||
[@"content-inset", CGInsetMake(2.0, 11, 1.0, 10.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare]],
|
||||
[@"min-size", CGSizeMake(32.0, 21.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare]],
|
||||
|
||||
// Small size
|
||||
@@ -2381,8 +2382,8 @@ var themedButtonValues = nil,
|
||||
[@"bezel-color", smallNbHighlightedButtonCssColor, [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall, CPThemeStateKeyWindow, CPThemeStateHighlighted]],
|
||||
[@"bezel-color", smallNbDisabledButtonCssColor, [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall, CPThemeStateDisabled]],
|
||||
[@"bezel-color", smallNbDisabledButtonCssColor, [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall, CPThemeStateDisabled, CPThemeStateKeyWindow]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(0.0, 0.0, 0.0, 0.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
[@"content-inset", CGInsetMake(-3.0, 13, 0, 2.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(1.0, 0.0, 0.0, 0.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
[@"content-inset", CGInsetMake(1.0, 11, 1.0, 9.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
[@"min-size", CGSizeMake(32.0, 18.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeSmall]],
|
||||
|
||||
// Mini size
|
||||
@@ -2391,8 +2392,8 @@ var themedButtonValues = nil,
|
||||
[@"bezel-color", miniNbHighlightedButtonCssColor, [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini, CPThemeStateKeyWindow, CPThemeStateHighlighted]],
|
||||
[@"bezel-color", miniNbDisabledButtonCssColor, [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini, CPThemeStateDisabled]],
|
||||
[@"bezel-color", miniNbDisabledButtonCssColor, [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini, CPThemeStateDisabled, CPThemeStateKeyWindow]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(0.0, 0.0, 0.0, 0.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]],
|
||||
[@"content-inset", CGInsetMake(-3.0, 13, 0, 2.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(1.0, 1.0, 0.0, 0.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]],
|
||||
[@"content-inset", CGInsetMake(1.0, 11, 1.0, 8.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]],
|
||||
[@"min-size", CGSizeMake(32.0, 16.0), [CPPopUpButtonStatePullsDown, CPButtonStateBezelStyleRegularSquare, CPThemeStateControlSizeMini]]
|
||||
|
||||
];
|
||||
|
||||
Reference in new issue
Block a user