From 37114612010e138ea8f575c1b2fa0ef69eb8147f Mon Sep 17 00:00:00 2001 From: daboe01 Date: Fri, 30 Sep 2022 11:15:26 +0200 Subject: [PATCH] fixed: overlap between text and button in combobox --- AppKit/Themes/Aristo3/ThemeDescriptors.j | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/AppKit/Themes/Aristo3/ThemeDescriptors.j b/AppKit/Themes/Aristo3/ThemeDescriptors.j index 30ff6034e..54ac594a8 100644 --- a/AppKit/Themes/Aristo3/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo3/ThemeDescriptors.j @@ -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]