From 7bf408aba0e4c890be7cf6ea7e44ada915b05a1f Mon Sep 17 00:00:00 2001 From: daboe01 Date: Tue, 22 Aug 2017 22:02:42 +0200 Subject: [PATCH] fixed: legacy scrollers used aristo1 artwork in aristo2 --- ...scroller-legacy-horizontal-knob-center.png | Bin 76 -> 0 bytes .../scroller-legacy-horizontal-knob-left.png | Bin 102 -> 0 bytes .../scroller-legacy-horizontal-knob-right.png | Bin 102 -> 0 bytes ...croller-legacy-horizontal-track-center.png | Bin 84 -> 0 bytes .../scroller-legacy-horizontal-track-left.png | Bin 171 -> 0 bytes ...scroller-legacy-horizontal-track-right.png | Bin 168 -> 0 bytes .../scroller-legacy-vertical-knob-bottom.png | Bin 95 -> 0 bytes .../scroller-legacy-vertical-knob-center.png | Bin 75 -> 0 bytes .../scroller-legacy-vertical-knob-top.png | Bin 96 -> 0 bytes .../scroller-legacy-vertical-track-bottom.png | Bin 167 -> 0 bytes .../scroller-legacy-vertical-track-center.png | Bin 77 -> 0 bytes .../scroller-legacy-vertical-track-top.png | Bin 161 -> 0 bytes .../Resources/scroller-right-arrow.png | Bin 396 -> 546 bytes .../Aristo2/Resources/scroller-up-arrow.png | Bin 388 -> 597 bytes .../scroller-vertical-track-disabled.png | Bin 78 -> 3732 bytes .../Resources/scroller-vertical-track.png | Bin 81 -> 3732 bytes AppKit/Themes/Aristo2/ThemeDescriptors.j | 52 +++++++----------- 17 files changed, 20 insertions(+), 32 deletions(-) delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-center.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-left.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-knob-right.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-left.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-right.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-bottom.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-center.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-knob-top.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-bottom.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-center.png delete mode 100644 AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-top.png 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 098fd5f02aaa5c85ca131a6849b7d37bfc948172..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrC!2%>*y!KrOQo^1tjv*Y;$v@5?U~uQz7a`yy Z#&DvGQ}o-;&M=@fgQu&X%Q~loCICN{5@`Sc 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 031e16dbf6c86dd43c6f9945d4850791eaceb2fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y?!2%>5_UF9`R0v2a zNK2TI{DIYpt(@a2_re&3DLgGn2?EI*j%9H%=vmdKI;Vst0NfcI AvH$=8 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 541c61299b213dbfcd060ade8a56443008a52cec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y?!2%>5_UF9xRVJ|?&<31vd$@?2>|#{7E}NL 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 04e2510a68c856795b30a65349770065297dcd06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^+(6970VEjiaP9O2QbnFFjv*Y;$(BbL*mbTYy!yR% zzf6wK{{v^d?=boJBz*gCZBujRjKH_m|C!F{1bmB@6AMdAOEdUAn?svBzopr02}5%r~m)} 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 5a9e6c8b15724df5a39dde51490bbad963e83c2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^+(6970VEjiaP9O2Qu&@Pjv*Y;uE+NBxfzHwJhaO7 z|La;J)O^}tXLWeO770}q39FiT7Y*Ac^UBHWuk=p@#ZMPym3X-}l3!foNJ#1Sz=c=- z&(w+i_$7+Pe$#_F+&d>fG>WLZy_GHH*o@~hpKO%vn^1FCe`jf=!KJv{&b 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 da41c8293dd4c0da2ebf81b4aab88df20cdc1960..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^d_c_1!2%>X?|*9nQfi(qjv*Y;$v@6BH1d4o*;kOk sFWT(wrQqqc$h&DtZiA4SgOnB*#KZf6l#r*3V+cod@{jWjjXe8K2q>{J Ybn|eETB>UM17#UJUHx3vIVCg!0Ns2J#Q*>R 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 517d339992449b178bd393c313f5b2adf42c91d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^d_c_1!2%>X?|*9nQtF;Ajv*Y;$v@6BG&(38OE~<1 u_ec_tf#HrN7R~xHUW>eMDSO^>KEe-QBV7hnLi?dV8#rI z|NARWS9HX7^zxqiTR#2c1O{_y>lvpHe0VSWSTT^V%uM3DIzw7y$SqTw*7YE}Jzf1= J);T3K0RT_oKcoNv diff --git a/AppKit/Themes/Aristo2/Resources/scroller-right-arrow.png b/AppKit/Themes/Aristo2/Resources/scroller-right-arrow.png index c536cf3f7f4288d49152a584438cfca974479c97..668ecb73a5572e9d224752ed8d8dc1793f1c9832 100644 GIT binary patch literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^5RtPXT0ZVp4u-iLH_n z$Rap^xU(cP4PjGWG1OZ?59)(t^bPe4^x=Lk@tXt0Q1}lwl^9iSIlgz z)p$9BIqfHB0=HJcFMf`NB{e^{)l6$FPH()(q}Vd8I8XV!tx&p@;6clFiO1?G+#keN zY*kvy^4^xaGEFyqmjF{#c0{)Rx!tT2f(}VAFBOqK$2h%isYuzhr4y3>)i(0^WXm*c T`8D%7C^kJ^{an^LB{Ts59LKI# delta 380 zcmV-?0fYXc1dIca8Gix*0042un2Z1b0aHmtK~y-)os&&=f-n??Ln>HPdvw&PdyzFb zVG(Y_b+`mK;M5~BDig=Gbs&y`!COnHk04~Zg06GHUKE*1+|vmVi>8)y^P>sbCFgfQRtCzFYt zngv1?QL54>igi@2=+S62oleK&F(Pdt=L%LLRXt~{R%L}PxBLe|FdPnxd(hwY7)U8O z7bt)@3I|y}%*7#8@;rx-kOBoWul@exDu0F0{GKc{K> a-I5<@80kYa2U!*X0000l#hD=Epg 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 delta 49 zcmbOt>o-AJn?cmm#W93KHn}b~Ff=weI-H-WbgLvBLvNu4LMSRl#7I**D@s#}^cFfONRuK> zI*4G9DzFp@0-;>o-EY5p&-0vf=DcU-eP`z1#F!ZA(g8Vv004kaUr)>Q;%2zmWHc8C zK(L{71pv4*kAlNZ^x<%j2?p(o@^S$HEN}(p)D~uaY}wYyBg_xdm|>$=M3DyhREf3} zcVhSw)oG+D$*TF{BpL&m+VQ!$qH)(Fx}Q?gdQ!L0Hj9dGEQ-rZqM2hY0vAZFK|crI zpJ(|GWy0Ki04B>)l;k`>K<`oZ$nc0L@~v3=D~0b{0BW(Y`(0VFnClE1kIxG$@KhFMD{E`p+O z$T;SP@EMV-8=>^>J>a0kA9?Y;(5Aa8<6j&xFkmP=@p(RplW)Lad9T%pc>d63Pf(zl zV8ZO874@M|rM689w=U9M!MN=veVP}wlj7xLbFE7i@LHIBH(xY5k}q4VFS-EkMeBFF zL<+>_2#rQ#1T{>R$pD5D2`nrO)qGv;Codfcj4kj1hnNr+zWT?F$(^oxKPjA^X066@ zNHfAir)3@PrKT=$0zw>tUxvedd5i~pfl0IWyS z_sCHw#)L^3QC_~9fDx)6i9{8+72dgCN_R>1%L?s!NFueHR%bS0R)LO}A&QzO_Ti%3 z%Tz|p61mdMiPp?q)#PyYt0iYPlcY$gkqL(h}z&~;xzlNxqD2k@1qrlNn4|KPU~vJsvW zv7tsBox?6*m#p*eg zo?LI|tkNlCH6d6F1d@9uzTqspe0FdO#}$Sab`-F7a+bJ@-Bm`I<#~oB+~eem)6`%*@kxw~_B zR0t2>M;~_&#p3WbQr5!IzY%@D}UMe!uwyOHnDN3!j^ZWdLaWY7iFrX(8EZzhg2yaiwXvA6E|4Q21g5td^F6wq zu|>bBYm>WrKk?Tf^AfNL#Vwsi--ek+Q02IwZw2Hlei*xbJScZ4w!?3F0Dj_LhZpSF zY*(~-AON5|R4E|C5{f;5#-2(=6O_RpWXE{3g9sq1l>pd&+-sWDN38Z> zQR<9#c@sL1_AuXTa_u}1scZl*G`Jcs4W~eMuI@*e+XFNhnKgCBnUGyH(z;%Zx?QZh znkPvnf`CG@Ow}@Uam~cOI)~2>jECK`m7|-1s&7hGc^h`#b^k21uwFQ~$?89vA=b59|yA-<$ zx}JBbbbarV=!)tJV~)wch3C7U+@WunoQ}}4GA`k}E`SsYNSf~z>*wfG?5FG%>fc=k zE*UHb_FYeF5&vc3qi(A`Z!?cnwNcepH4ke#kw4Noy0wSgy96u&{sGJeN(0w{w5hVn$^Ot{e2E`G~y- zrS!2m^J4fd4Q+KQgmVNJMB3gInQe+)F#x)#7Cbi9Z8Et3R-3_=)J>ffHI8jj2f*39iEKM4h96y;b9S2U-mt-Lx z7R485l#ohl#@UO}W@_d01sda3$x_Wz9>!VnVZxlmJ{>#SJ%)J=!xx{QgSqMjMvI;DxgL@ zi(J;6(tR2~?i4vBBsC|!V48A&{#iOt1aVtDt3U6LJH~fN&xp?>p9y`meg@@aNVj;^ z_3CQ+rgW2AiTw|cS02qDYiDYQ2YS8mmaQ{BHD6ZtRw`Dwe+I08S1Q4h;6*T-HFy15 z{dl#r#fs&h_3u2j>-Xwkx!gqsgi89AZA?F_=IXJn*D22`Q=DX-eBoun<;GPpsFNX4 zPhox2y4Aa2i%v;MsTo=S)u+YiA(&)BA}4ho41aw2{1$fu#^zIFf}98^L$*&4_c-_C z>p*VK>t}(rfzFEe6l{5od3dG5&JK@vhef6h?Tx492yauG$D9khjRuW)Gm)9Np}HXz zh%2NI!e!&r=+UUt2nkTx(DBV!l3ytA+bVCVX_*dfBiZo;@^J99C^w5(895uz$?v`? zj1d|0k8_J+pOBc@aI2(8JE7kO75uuyYnF30M?9xzzj`10fbMiga8{6z4^OcrHIs&j zDt|^DQ696Bko)F86Nu1XZM^o(iELF$uc0GizDD16L7FCdBmJ+ru3VyuyEC{(8+bXJ zD@0sNOc0i@yrfYSP$X6BCj(Oq-uuxP)H%?3=n&PZp&$?vaQL3)Q?w;hn+~&p0KWu3 zuePGrvTmJLsqS#}JnN~rtLeaAx>EJM>g4Gah2_Tl#vhGSyJ5Sfi%M^wWyl2e<0#%! z_-Kami%CPO#jC?h&d2M_T9Px9W0PkKEsZ|C4D@N9$IkBy$fmkUxpC_W3-*X?8-xvC zal0o&a+7iONuTN2b18RHxxK4znKIgW;9TjbW<)eZrp;!pysU?nM|~d@Ti(ZnHZ9Ms zu4}AkjM=$8aog-Y?2236>P!7(IOO%MbXWGU5PzixgRh|RqR@UEZ~14<nnKXt62)d|A@WK?uX}=N5kgl zSu;HQX4+;b9(v!7be4EJNNvL~&LgMRNJu<>vk1$FG*oO$t@`SQYM!P&{q}T4C*dQ! zZT7r5udlIqF?uCwS(i1Qjpr0AxovUo*SkV-BEa)T>(}W10*}{BJi!qP4CAL0T ze6>&~JH;^tt;N+LQ3>8{_XXBfs;BV%9#Tbz?vidn!gC(;Af>>YM2dZzFd3r$lv(>&#C)#W z-SfGffgdyNZ6RkKTN$HMM4Q8tv4vZ9Ypv6}n2t{?XVGV*N*O!4caX3=lIyDVR0DW> zaY2PA{WN>Ob+dDt;W;l{b^bK_gzegc}axm<|^mf5IfP%ffeEea-D*S(Wz%K0HFq9wkmkZWYh2P?~2?&nHxPWdz zOQPg_&yU{1blhQsH;UVtrvyXi!iPBuEy5#<)SH6%`esQZi5(8SsS% z*#Eu{)*%?|<1g?x$^Y?ax%fL_P`+3c+6VNT*TE4TfK}n=|1I?I`a4f7%Ju)1eEk0@ z>!LvD?;of%L<;&Z_eH4kZxm*XLAhKg|K?YfR{qQLf3Saal%c=H|0|ilEBy<-C{-1x x4E?ulszAdI5zC8CUeVXmK+s%wIvIXM4q#v+BZFKrasJ(6eQhJH3QhaR{{hbG?3Vxl delta 52 zcmbOt8#qB(k3quI#W93KHreL%v18|s9XoXD%#k1e@87@AApV8r)BjmKRSZDj>FVdQ I&MBb@0AvRjRR910 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];