diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-center.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-center.png deleted file mode 100644 index 098fd5f02..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-center.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-left.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-left.png deleted file mode 100644 index 031e16dbf..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-left.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-right.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-right.png deleted file mode 100644 index 541c61299..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-right.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png deleted file mode 100644 index cadda610c..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-left.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-left.png deleted file mode 100644 index 04e2510a6..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-left.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-right.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-right.png deleted file mode 100644 index 5a9e6c8b1..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-right.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-bottom.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-bottom.png deleted file mode 100644 index da41c8293..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-bottom.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-center.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-center.png deleted file mode 100644 index a30f8981f..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-center.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-top.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-top.png deleted file mode 100644 index 517d33999..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-top.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-bottom.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-bottom.png deleted file mode 100644 index 51517a659..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-bottom.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-center.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-center.png deleted file mode 100644 index b5afcbb9d..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-center.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-top.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-top.png deleted file mode 100644 index c41a4afb2..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-top.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-right-arrow.png b/AppKit/Themes/Aristo2/Resources/scroller-right-arrow.png index c536cf3f7..668ecb73a 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-right-arrow.png and b/AppKit/Themes/Aristo2/Resources/scroller-right-arrow.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-up-arrow.png b/AppKit/Themes/Aristo2/Resources/scroller-up-arrow.png index eaa182606..dd6a1d60b 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-up-arrow.png and b/AppKit/Themes/Aristo2/Resources/scroller-up-arrow.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-disabled.png b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-disabled.png index 174a43363..b0423c5bf 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-disabled.png and b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track.png b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track.png index d940f4084..b0423c5bf 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track.png and b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track.png differ diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 365cadba0..0d2f2d7d9 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -508,10 +508,6 @@ var themedButtonValues = nil, orientation: PatternIsVertical }), - trackColorLegacy = PatternColor("scroller-legacy-vertical-track-center.png", 14.0, 1.0), - incrementColorLegacy = PatternColor("scroller-legacy-vertical-track-bottom.png", 14.0, 11.0), - decrementColorLegacy = PatternColor("scroller-legacy-vertical-track-top.png", 14.0, 11.0), - knobColor = PatternColor( "scroller-vertical-knob{style}{position}.png", { @@ -556,19 +552,17 @@ 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", 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", knobColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], - [@"knob-color", knobColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobLight]], - [@"knob-color", knobColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobDark]], - [@"increment-line-color", incrementColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], - [@"decrement-line-color", decrementColorLegacy, [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], - [@"decrement-line-size", CGSizeMake(14.0, 11.0), [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], - [@"increment-line-size", CGSizeMake(14.0, 11.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-color", knobColor["dark"], [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], + [@"increment-line-color", [CPNull null], [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], + [@"decrement-line-color", [CPNull null], [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], + [@"decrement-line-size", CGSizeMakeZero(), [CPThemeStateVertical, CPThemeStateScrollViewLegacy]], + [@"increment-line-size", CGSizeMakeZero(), [CPThemeStateVertical, CPThemeStateScrollViewLegacy]] ]; [self registerThemeValues:themedVerticalScrollerValues forView:scroller]; @@ -588,10 +582,6 @@ var themedButtonValues = nil, orientation: PatternIsHorizontal }), - trackColorLegacy = PatternColor("scroller-legacy-horizontal-track-center.png", 1.0, 14.0), - incrementColorLegacy = PatternColor("scroller-legacy-horizontal-track-right.png", 11.0, 14.0), - decrementColorLegacy = PatternColor("scroller-legacy-horizontal-track-left.png", 11.0, 14.0), - knobColor = PatternColor( "scroller-horizontal-knob{style}{position}.png", { @@ -634,17 +624,15 @@ 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", trackColorLegacy, CPThemeStateScrollViewLegacy], - [@"knob-slot-color", trackColorLegacy, [CPThemeStateScrollViewLegacy, CPThemeStateSelected]], - [@"knob-slot-color", trackColorLegacy, [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobLight]], - [@"knob-slot-color", trackColorLegacy, [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobDark]], - [@"knob-color", knobColorLegacy, CPThemeStateScrollViewLegacy], - [@"knob-color", knobColorLegacy, [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobLight]], - [@"knob-color", knobColorLegacy, [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobDark]], - [@"increment-line-color", incrementColorLegacy, CPThemeStateScrollViewLegacy], - [@"decrement-line-color", decrementColorLegacy, CPThemeStateScrollViewLegacy], - [@"decrement-line-size", CGSizeMake(11.0, 14.0), CPThemeStateScrollViewLegacy], - [@"increment-line-size", CGSizeMake(11.0, 14.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-color", knobColor["@"], CPThemeStateScrollViewLegacy], + [@"knob-color", knobColor["light"], [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobLight]], + [@"knob-color", knobColor["dark"], [CPThemeStateScrollViewLegacy, CPThemeStateScrollerKnobDark]], + [@"decrement-line-size", CGSizeMakeZero(), CPThemeStateScrollViewLegacy], + [@"increment-line-size", CGSizeMakeZero(), CPThemeStateScrollViewLegacy] ]; [self registerThemeValues:themedHorizontalScrollerValues forView:scroller];