colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-19 00:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed: overlap between text and button in combobox

Browse Source
This commit is contained in:
daboe01
2022-09-30 11:15:26 +02:00
parent 4ddd8ac263
commit 3711461201
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/Themes/Aristo3/ThemeDescriptors.j
+3 -6
View File
@@ -4206,10 +4206,9 @@ var themedButtonValues = nil,
[@"bezel-color", disabledButtonCssColor, [CPComboBoxStateButtonBordered, CPThemeStateDisabled]],
[@"bezel-color", disabledButtonCssColor, [CPComboBoxStateButtonBordered, CPThemeStateDisabled, CPThemeStateKeyWindow]],
[@"content-inset", CGInsetMake(1.0, 19.0, 1.0, 9.0), [CPComboBoxStateButtonBordered]],
[@"content-inset", CGInsetMake(2.0, 0.0, 0, 2), [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
[@"content-inset", CGInsetMake(2.0, 17.0, 0, 2), [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
[@"min-size", CGSizeMake(32.0, 21.0)],
[@"max-size", CGSizeMake(-1.0, 21.0)],
[@"nib2cib-adjustment-frame", CGRectMake(2.0, -8.0, -5.0, -5.0)],
// Small size
[@"bezel-color", smallButtonCssColor, [CPThemeStateControlSizeSmall, CPComboBoxStateButtonBordered, CPThemeStateKeyWindow]],
@@ -4219,10 +4218,9 @@ var themedButtonValues = nil,
[@"bezel-color", smallDisabledButtonCssColor, [CPThemeStateControlSizeSmall, CPComboBoxStateButtonBordered, CPThemeStateDisabled]],
[@"bezel-color", smallDisabledButtonCssColor, [CPThemeStateControlSizeSmall, CPComboBoxStateButtonBordered, CPThemeStateDisabled, CPThemeStateKeyWindow]],
[@"content-inset", CGInsetMake(1.0, 19.0, 1.0, 9.0), [CPThemeStateControlSizeSmall, CPComboBoxStateButtonBordered]],
[@"content-inset", CGInsetMake(2.0, 17.0, 0, 2), [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
[@"min-size", CGSizeMake(32.0, 18.0), [CPThemeStateControlSizeSmall]],
[@"max-size", CGSizeMake(-1.0, 18.0), [CPThemeStateControlSizeSmall]],
[@"nib2cib-adjustment-frame", CGRectMake(2.0, -8.0, -5.0, -5.0), [CPThemeStateControlSizeSmall]],
[@"content-inset", CGInsetMake(2.0, 1.0, 0, 2), [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
// Mini size
[@"bezel-color", miniButtonCssColor, [CPThemeStateControlSizeMini, CPComboBoxStateButtonBordered, CPThemeStateKeyWindow]],
@@ -4232,10 +4230,9 @@ var themedButtonValues = nil,
[@"bezel-color", miniDisabledButtonCssColor, [CPThemeStateControlSizeMini, CPComboBoxStateButtonBordered, CPThemeStateDisabled]],
[@"bezel-color", miniDisabledButtonCssColor, [CPThemeStateControlSizeMini, CPComboBoxStateButtonBordered, CPThemeStateDisabled, CPThemeStateKeyWindow]],
[@"content-inset", CGInsetMake(1.0, 19.0, 1.0, 9.0), [CPThemeStateControlSizeMini, CPComboBoxStateButtonBordered]],
[@"content-inset", CGInsetMake(2.0, 17.0, 0, 2), [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
[@"min-size", CGSizeMake(32.0, 15.0), [CPThemeStateControlSizeMini]],
[@"max-size", CGSizeMake(-1.0, 15.0), [CPThemeStateControlSizeMini]],
[@"nib2cib-adjustment-frame", CGRectMake(2.0, -8.0, -5.0, -5.0), [CPThemeStateControlSizeMini]],
[@"content-inset", CGInsetMake(2.0, 1.0, 0, 2), [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
[@"popup-button-size", CGSizeMake(21.0, 23.0), [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
[@"popup-button-size", CGSizeMake(17.0, 23.0), CPThemeStateBezeled]