From 255f91f7ca1b729a0af84896b2baeb38ebc121fc Mon Sep 17 00:00:00 2001 From: daboe01 Date: Mon, 4 Sep 2017 22:59:34 +0200 Subject: [PATCH] fixed: cornerview looked odd without scroller margins --- ...croller-legacy-horizontal-track-center.png | Bin 0 -> 92 bytes .../scroller-legacy-vertical-track-center.png | Bin 0 -> 85 bytes AppKit/Themes/Aristo2/ThemeDescriptors.j | 26 ++++++++++-------- 3 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-center.png diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png new file mode 100644 index 0000000000000000000000000000000000000000..750495731c2952960ecb70f4d07b1c4a5267e2ad GIT binary patch literal 92 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrC!3HGXIhVzN1d4;)ofy`glX(f`h)GP~Z07;lL3FmJ}g|8++NK`1mjL097z}y85}Sb4q9e0D)GP+tV(vzZH>)14>@lw$C7^>bP0l+XkKp)V4B literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 0d2f2d7d9..a86b0de11 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -508,6 +508,8 @@ var themedButtonValues = nil, orientation: PatternIsVertical }), + trackColorLegacy = PatternColor("scroller-legacy-vertical-track-center.png", 14.0, 1.0), + knobColor = PatternColor( "scroller-vertical-knob{style}{position}.png", { @@ -531,7 +533,7 @@ var themedButtonValues = nil, [@"minimum-knob-length", 21.0, CPThemeStateVertical], // Overlay - [@"scroller-width", 9.0, CPThemeStateVertical], + [@"scroller-width", 14.0, CPThemeStateVertical], [@"knob-inset", CGInsetMake(2.0, 0.0, 0.0, 0.0), CPThemeStateVertical], [@"track-inset", CGInsetMake(2.0, 0.0, 2.0, 0.0), CPThemeStateVertical], [@"track-border-overlay", 12.0, CPThemeStateVertical], @@ -552,12 +554,12 @@ var themedButtonValues = nil, [@"knob-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], [@"track-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], [@"track-border-overlay", 0.0, [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], - [@"knob-slot-color", trackColor["light"], [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], - [@"knob-slot-color", trackColor["light"], [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateSelected]], - [@"knob-slot-color", trackColor["light"], [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateSelected, CPThemeStateScrollerKnobLight]], - [@"knob-slot-color", trackColor["dark"], [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateSelected, CPThemeStateScrollerKnobDark]], - [@"knob-slot-color", knobColor["@"], [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobDark]], - [@"knob-slot-color", knobColor["light"], [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobLight]], + [@"knob-slot-color", trackColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], + [@"knob-slot-color", trackColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateSelected]], + [@"knob-slot-color", trackColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateSelected, CPThemeStateScrollerKnobLight]], + [@"knob-slot-color", trackColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateSelected, CPThemeStateScrollerKnobDark]], + [@"knob-slot-color", trackColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobDark]], + [@"knob-slot-color", trackColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobLight]], [@"knob-color", knobColor["dark"], [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], [@"increment-line-color", [CPNull null], [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], [@"decrement-line-color", [CPNull null], [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], @@ -582,6 +584,8 @@ var themedButtonValues = nil, orientation: PatternIsHorizontal }), + trackColorLegacy = PatternColor("scroller-legacy-horizontal-track-center.png", 1.0, 14.0), + knobColor = PatternColor( "scroller-horizontal-knob{style}{position}.png", { @@ -624,10 +628,10 @@ var themedButtonValues = nil, [@"knob-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateScrollViewLegacy], [@"track-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateScrollViewLegacy], [@"track-border-overlay", 0.0, CPThemeStateScrollViewLegacy], - [@"knob-slot-color", trackColor["light"], CPThemeStateScrollViewLegacy], - [@"knob-slot-color", trackColor["light"], [CPThemeStateScrollViewLegacy, CPThemeStateSelected]], - [@"knob-slot-color", trackColor["light"], [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobLight]], - [@"knob-slot-color", trackColor["dark"], [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobDark]], + [@"knob-slot-color", trackColorLegacy, CPThemeStateScrollViewLegacy], + [@"knob-slot-color", trackColorLegacy, [CPThemeStateScrollViewLegacy, CPThemeStateSelected]], + [@"knob-slot-color", trackColorLegacy, [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobLight]], + [@"knob-slot-color", trackColorLegacy, [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobDark]], [@"knob-color", knobColor["@"], CPThemeStateScrollViewLegacy], [@"knob-color", knobColor["light"], [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobLight]], [@"knob-color", knobColor["dark"], [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobDark]],