From 9ab63ee85426db9cf3cbe7c124ce9265a1f63cdf Mon Sep 17 00:00:00 2001 From: daboe01 Date: Fri, 10 Jun 2022 08:52:06 +0200 Subject: [PATCH] fixed: handling combo-box over heights --- AppKit/CPComboBox.j | 1 + AppKit/Themes/Aristo3/ThemeDescriptors.j | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/AppKit/CPComboBox.j b/AppKit/CPComboBox.j index a825651b3..4e5387d44 100644 --- a/AppKit/CPComboBox.j +++ b/AppKit/CPComboBox.j @@ -92,6 +92,7 @@ var CPComboBoxTextSubview = @"text", return @{ @"popup-button-size": CGSizeMake(21.0, 29.0), @"border-inset": CGInsetMake(3.0, 3.0, 3.0, 3.0), + @"uses-focus-ring": YES, }; } diff --git a/AppKit/Themes/Aristo3/ThemeDescriptors.j b/AppKit/Themes/Aristo3/ThemeDescriptors.j index c1e26d30c..e596d0489 100644 --- a/AppKit/Themes/Aristo3/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo3/ThemeDescriptors.j @@ -3823,11 +3823,12 @@ var themedButtonValues = nil, @"border-radius": @"3px", @"text-align": @"center", @"right": @"1px", - @"top": @"8px", + @"top": @"7px", @"margin": @"-6px 0px 0px 0px", @"position": @"absolute", - @"height": @"15px", - @"width": @"15px" + @"height": @"90%", + @"width": @"15px", + @"border-width": @"2px", }], @@ -3856,11 +3857,12 @@ var themedButtonValues = nil, @"border-radius": @"3px", @"text-align": @"center", @"right": @"1px", - @"top": @"8px", + @"top": @"7px", @"margin": @"-6px 0px 0px 0px", @"position": @"absolute", - @"height": @"15px", - @"width": @"15px" + @"height": @"90%", + @"width": @"15px", + @"border-width": @"2px", }], disabledButtonCssColor = [CPColor colorWithCSSDictionary:@{ @@ -3880,11 +3882,12 @@ var themedButtonValues = nil, @"border-radius": @"3px", @"text-align": @"center", @"right": @"1px", - @"top": @"8px", + @"top": @"7px", @"margin": @"-6px 0px 0px 0px", @"position": @"absolute", - @"height": @"15px", - @"width": @"15px" + @"height": @"90%", + @"width": @"15px", + @"border-width": @"2px", }], highlightedButtonCssColor = [CPColor colorWithCSSDictionary:@{ @@ -4094,10 +4097,10 @@ var themedButtonValues = nil, overrides = [ + [@"uses-focus-ring", YES], [@"direct-nib2cib-adjustment", YES], [@"text-color", A3CPColorActiveText], [@"text-color", A3CPColorInactiveText, [CPThemeStateDisabled]], -// [@"menu-offset", CGSizeMake(-2, 1)], // Bordered, IB style "Push" (CPRoundedBezelStyle)