From 3d4a33d3734db6f928cf66c2477de0bb6cb59663 Mon Sep 17 00:00:00 2001 From: Thomas Ingham Date: Tue, 18 May 2010 21:30:51 -0400 Subject: [PATCH] Re-preflight on the image assets resulting in 24px tall images in each case. This is done by cutting the top edge close (well into the aliased edge on top.) Added defs for the horizontal and vertical sliders. --- .../HUD/segmented-control-bezel-center.png | Bin 164 -> 140 bytes ...egmented-control-bezel-disabled-center.png | Bin 139 -> 140 bytes ...gmented-control-bezel-disabled-divider.png | Bin 121 -> 124 bytes .../segmented-control-bezel-disabled-left.png | Bin 227 -> 228 bytes ...segmented-control-bezel-disabled-right.png | Bin 228 -> 227 bytes .../HUD/segmented-control-bezel-divider.png | Bin 119 -> 124 bytes ...ented-control-bezel-highlighted-center.png | Bin 154 -> 159 bytes ...trol-bezel-highlighted-disabled-center.png | Bin 159 -> 159 bytes ...rol-bezel-highlighted-disabled-divider.png | Bin 121 -> 124 bytes ...ontrol-bezel-highlighted-disabled-left.png | Bin 241 -> 241 bytes ...ntrol-bezel-highlighted-disabled-right.png | Bin 246 -> 245 bytes ...nted-control-bezel-highlighted-divider.png | Bin 121 -> 124 bytes ...gmented-control-bezel-highlighted-left.png | Bin 244 -> 244 bytes ...mented-control-bezel-highlighted-right.png | Bin 246 -> 251 bytes .../HUD/segmented-control-bezel-left.png | Bin 225 -> 226 bytes .../segmented-control-bezel-pushed-center.png | Bin 145 -> 146 bytes ...ontrol-bezel-pushed-highlighted-center.png | Bin 145 -> 145 bytes ...-control-bezel-pushed-highlighted-left.png | Bin 225 -> 226 bytes ...control-bezel-pushed-highlighted-right.png | Bin 225 -> 226 bytes .../segmented-control-bezel-pushed-left.png | Bin 225 -> 227 bytes .../segmented-control-bezel-pushed-right.png | Bin 225 -> 227 bytes .../HUD/segmented-control-bezel-right.png | Bin 227 -> 227 bytes AppKit/Themes/Aristo/ThemeDescriptors.j | 68 ++++++++++++++++++ 23 files changed, 68 insertions(+) diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-center.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-center.png index 1e82207f01603708d0cb51ce752a7759764dca1d..455b25deceee2c6fce8de267cb18c212ab91dde1 100644 GIT binary patch delta 74 zcmZ3&*uyx%(^=2c#WAGfR+53S@$d6rUSHQ|Q)5#|`1Sw4y-}kt&wimj%M9v&d}y2~ ecw!P0hXKP;YxBzDY1eKu0D-5gpUXO@geCxx6dq~- delta 98 zcmV-o0G@~ diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-center.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-center.png index 0632660c48c85b68af230f10aed608127d8bb13f..a32359e5cf79947de52a72c08b57ae4177354bff 100644 GIT binary patch delta 74 zcmeBX>|vbX>8$7J;uunKE6K>%`1biPudnN~sj(>}{QCdj-l)-+XTQ*%Wd`*>J~U2b eJR!u!VZg9b-rP7k>fdt)An}H(c>7?uF;uunKD=8@7J63SY)X cmIel9hG{&88z0Tpe8K<(p00i_>zopr03qxfs{jB1 diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-divider.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-divider.png index 1ebec04faefd9d16ea301579c5350d93242623f3..a07b15d5c69df4799187593410fd509d623f633f 100644 GIT binary patch delta 56 zcmb=dnc!(G=jq}YQgJIOAtB+$c@`Ck7mfzZhRUD+|Nk$~%p$>%y_@CY(bVGY3_#%N L>gTe~DWM4fZNn8D delta 53 zcmb=aoZx97?djqeQgJIOAtAwoA*t=JkHRE57GnWpCKd^Xj*X0dwl`-kW&i?DS3j3^ HP6e(L_t(|+G1p2V31Z(QOOe!5YS;_V&Y-}5@vjSeENU?{$>C3 z=MMwZzkmPu|NsBb4#W%~zyczGf($SK7J$iO6<}gO1BA6uLx2oxso_#478aJDK!Kky z0cIs7C9cn(KMMgRgcunaSs5-}y2P%ks%i%mhyW@`V1(*t0~}&5kPd(V0{{?EN{cPZ R69)hQ002ovPDHLkV1jh3KL7v# delta 162 zcmV;T0A2s&0pkIXNq>b&L_t(|+G1gV07)P=24WFLAR(=yqLL>dAfUs<#Kgq{B+U5u z`1Jq&{mcI6&mRV+fB*jR|NsA=9f-ktSwI9(kO2n30x(&u0!$2OfUp*72#{edHC)QX z!ou|z^tUC#P#{}XCa`35F;ZaE5oHrm)KQRRqcQR5gR}S2><~G0KTC|-X*z& Qe*gdg07*qoM6N<$f`ZOSa{vGU diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-right.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-right.png index 63cc8bb29dba6abb9ed5834cb77309d1f5ca5c91..9f3a03b7d656c2d96e40a4352a9a31e321f97b5b 100644 GIT binary patch delta 162 zcmV;T0A2s&0pkIXNq>b&L_t(|+F~>_Gu!{~-@k7kK76=x=gyr;EWdvJVqj!sjgD7^ON`4k72PVh>7k~i_0VW1CKv)Yk1jw+K8ZL#K0hIX3!ouCz>3MxY8|px|F1{u>6wzW@RZ01rf6pdP7* Qo&W#<07*qoM6N<$g0FQ&EC2ui delta 163 zcmV;U09^m$0ptOYNq>e(L_t(|+G1v4U`POB86f@)#9tWA%*^)x`}gnLhYugF+_`gS z63ee&zZe)98M*lQ`1F~Wn9Nv!${7Ct{|}N;m)j diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-divider.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-divider.png index aa7955d2d261b73f5708102469fe318fec798537..6811fc89a0c6c7031ee5e687eb631fa11809bf68 100644 GIT binary patch delta 56 zcmXS~nc!(G=jq}YQgJIODIwvgTe~DWM4fZxIy0 delta 51 zcmb;^pWvw{>FMGaQgJIOAt51yA*t(?&^rhotcGcf%J6aW4}x&J_{|NlYU zf0z;o0z=1tWQqR_3=l5!lgE!48Gy1<009O7VR=NH<6}}A00000NkvXXu0mjf5mYE9 delta 88 zcmbQwIE!(DXP}Lzi(^Q|t(4wCE(Qf2r&RW}eVdBkJ7+6v%#eTN?7~pcvol4IaWPA< sWaY$}OI*G^ij01tUowv?cps|-gR`0a^;gTQr!WA4r>mdKI;Vst0GaY2djJ3c diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png index 15fd9d92946b1dd87a6ff56db2aac316955016e6..06105ca177dc41a5720ceaeb4f201bcb1ce3731f 100644 GIT binary patch delta 86 zcmV-c0IC0<0iOYoP)}lxi%;0k^y}9z2Bv@i|1&WC2NVDPLAn1xtpEQ(+<%x72m(XL se`JaO3=9x1^OMJq8JU5yj{yP<07kh*D_y^)kpKVy07*qoM6N<$f-{{acK`qY delta 86 zcmV-c0IC0<0iOYoP)}ry$q4`;5Ch}dr`oB-XchZNJP;K8gbYK70VpBmQqA3AlwjIH s9^`7$LjK~$x6mszpEkzcS{MQh03ql>sINeAm;e9(07*qoM6N<$f=N*%1poj5 diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png index 6ad27c168ddff9d27050a2cdc6084ffee817deaf..513282884fe4d8ebf3ca62d78dc20dde38f4995d 100644 GIT binary patch delta 56 zcmb=dnc!(G=jq}YQgJIODIwv;c@`Ck7mfzZhRUD+|Nk$~%p$>%vzp~{dDH$23_#%N L>gTe~DWM4fZ(kKf delta 53 zcmb=aoZx97?djqeQgJIODIvilfl272LQ|t0i?M()6N>~x!gGdCUjn|{FaUw4tDnm{ Hr-UW|+cgn7 diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png index 1a82ba435a3460e5864e6bbbeb484a38cceee71d..e8bf1b6b0704234c78f835ec52cefcab443c0425 100644 GIT binary patch delta 168 zcmV;Z09XI<0r3HlQGZUc3IZ_& zFa1pX^r?KY)DY2hFJ-ExidhI@J&xnbIlnt04+*s25O+xxy>(A;18w W&rk{{CC4uS0000q5ca1o6K58RF4z-j6A4*(RnS9_m5V zzyvbP8-f5}R7cfbwIE%mzCT}gU3ak7&dC@PwryJyE~Ny-%ncyA%nW4;0{lE)hSUa& zRK^=3HNx_D>1X4oPvwhJLqy}0^H`vwnfHDjV_Z4cY!K1HFd+=f5W+>1Hx1k$0t^8A W=uKORBOKHK00001Bkx^1Q-CNA!&s;ChKbe0000u;#Vwj@d@$2fB*jW_|c;)M~)n3 zV*2f^zMOIk)opNWY{mF3_6{|pR3%*e>d{_o#E4wnBQ0S1s5gl75w?;is)fM`Jx zKv(hqKf0EGXj;fHl&}CgTe~DWM4fZ-ErT delta 53 zcmb=aoZx97?djqeQgJIOAt51yA*t=ZkHRE57GnWpCKd^XO&=N88EQu#WB>wBS3j3^ HP6v9T?dm6Nk(Wo6}MVPax3l9rLN14?lH`t^%}<=?-5Tnvni zTz~)lV*mjb5b+PnfeZXc7x?%8KbioBmjCEl{{5%eP{IOax%58?hBC3RuzdgX_wP55 zCJ<&;R8$oG_U)S}J3EI2BO@al!=+1?1XWd4gMli`fC?HIfgv_90vWuZPzM delta 168 zcmV;Z09XI?0rUZoRDWOwVtXJq0AfBCAmM0ZV_PgMCuhyd%F4^a#KdGIEhA$Gl;HaH z>lXvdzkmO@7#JD3{{H*N00JN_4F8}UxWIpOfq(!1qX}SW`H!yU-+zh?B`iReOaGH# zC=&|{%lAKj|9%5$0%2xFMMcqX-@b{mvvWu=GBUC;T)K2gP$5-SH5jO}45*+1Aiw~@ W!%jl+mxnh10000M2SO5S307*qoM6N<$f}4(3yZ`_I delta 181 zcmV;m080P+0rmlqNq?A0L_t(|+G1p2U}ym1Pe6PDhz~Nx#V7p#{rmUl$B!NzJ#yr5 zFVnAIzkm`9ywWlY%L_t(|+G1p2U{C>q$pQib)=W%HyevS%gO88T?(g5fTz~%j zVPN|A@1My3|Npswm;nS>Km<^b0S3SVFj=euOblp%uoh|vkYOz~T*}14!txy`@C_!w ztfZvG`}y-{NuY!TBO@al!=+1?I8{|ugMk8NKm`qqQ2iW0%o+zW6Cl6V$L_t(|+G1gV03{%H0b(geAfW;TlLZ6>teKdYcv*mi2Ol4w z-QT}|x&Hk5!@%_K-#?N6|NnCVF<37PhyV&QzyMePCW}>oi2)4|)d%IFi@Zjs2QLEAiw~S&`8T}G7`%G O0000BXhi(^Q|t)!sf;NR!J{QjQLrsn46#-_%m(6B*(WtN1Q>W|U`M`y(E ksW^Dz&;S4bqZt_47_`N?gQhE2Tx9?PPgg&ebxsLQ04;bQqW}N^ delta 79 zcmbQlIFWIJr-!kpi(^Q|t)zs6gp7oc;Naiqzx@85&!*<)=EkPBKw?U(!i6InG!L$4 j);sp+(NS)<1_ovZ(?a&|xBTuLVgLe9S3j3^P66jzjNZmiH)6%911!tjcRSaoOQAVhR?+H;|z@c{r?}& brEq|u%$wt{+a|v%1|aZs^>bP0l+XkKBN-c% delta 71 zcmbQpIFWHephH4JLPkPJaPaT*Uw(hjXH#=?b7NCmATgy?;lhy(ng`c2>mB>^=qR^a b0|PUIX(9XfTYh&AF#v(5tDnm{r-UW|I*lC( diff --git a/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-left.png b/AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-left.png index 3077ebaf054c35820844755815e10c6b1a560506..c81b5aba0efb86c25a72838fca38e4ec8462fa34 100644 GIT binary patch delta 161 zcmV;S0ABy$0pbCWNq>Y%L_t(|+G1p2U~rL^mM-Sz=C%g1d0Cj4n2b0$IPCuX`NQ@9 z|9=LifB*h*0cAj#fsv7sfeFL_$-n>$Oon&?CI&P>6D`ybAjhRFEG*xF0rU+d2*S*Y zii)D&zI_vAXJ?lH3a~L;x^ziURaG?@sIm;Gqk$2q9Ap45G#a3p00ImEUuhnEujZgX P00000NkvXXu0mjf)F?z$ delta 160 zcmV;R0AK&&0pS6VNq>V$L_t(|+G1pY03{%H0b(geAfX~HEj^i=o7)=5=4D}GV)EeN z;IRAi=MUHa|Nj}7{{8zW0+itb>0@MMWMBd@Kr%4E0+S(LfQbPO&_oM01junI3k%D4 zU;ups34$=Ql9Ced*RNkC+1c48fC6j`mo8o6R8>_C2C6Ir>KSMN2rvLt7aRExCzwV6 O0000Y%L_t(|+G12wQ~S@r!0`F&*RMyPK7HED^!xX3hChG)@N#f) z*fB9N88I<3GBQ8`*S~-NxR_wP|NsAkX%-|EL<%r5paGg_p@slCE(HmIFff3=v9Pdw z2b%#5x-TC-d^jX8FMkunZve`asj8|5U%GTjkP)a<3Zw{#zZ!v}10cWv4=ye{V$L_t(|+G1v4U}ykhH6VTu!i;KaYX5b&L_t(|+G1p2U{H~kmY&Sb&20^2^Rh58F?n!saM=C%^M~vI z|Njh3|Ni|G0m^UzF#{tbBLfqN0g{0M7MKk20!$2OfF@d~AwZ5xSy))U0|V$ANDzdX zm6VitzkdBH$d%IFi>R~P)7qJG(0(gm>UmdCP07z0F28XklFH} Q5&!@I07*qoM6N<$f*aREHvj+t delta 160 zcmV;R0AK&(0pS6VNq>V$L_t(|+G1pY03{%H0b(geAfX~HEj^i=o7)=5=4D}GV)EeN z;IRAi=MUHa|Nj}7{{8zW0+itb>0@MMWMBd@Kr%4E0+S(LfQbPO&_oM01junI3k%D4 zU;ups34$=Ql9Ced*RNkC+1c48fC6j`mo8o6R8>_C2C6Ir>KSMN2rvLt7aRExCzwV6 O0000b&L_t(|+G12wQ~S@r!0`F&*RMyPK7E?Y^85F121Z6kUJecp zJ0>P34<;ao0SdVO{re}v1mpex{~t`VAgLfyfQbPO&_oM01junINC1R^0rZW9h2=Zg z3}DcG`S9VxAq546iy-w4K$&lfii&sFu3fv05vWuODEJ46KN|t@4}bsz0KB*?do@Y~ Qg8%>k07*qoM6N<$g7Qj5x&QzG delta 160 zcmV;R0AK&(0pS6VNq>V$L_t(|+G1v4U}ykhH6VTu!i;KaYX5H<0pkIXQGYQrGyDJV-@nfvK72TO=gys6mS4YqF)%VR^78TV*)cIOd9W}5 z!T zJEEYVa1kWg0F)_HRaFhXbm`KmjD0&07*qo IM6N<$f=C!U%>V!Z delta 154 zcmV;L0A>H<0pkIXQGaG&U}ykhH6VTu!i;8SX8-^F`}g_7hYv^Z+_{s>^6S?x21Z6k zUOqlPJ0>P34;G*@hX4QngD5VbN)Z+)2PVh>7k~i_0VW1CKv)Yk1jw+K8ZL#K0hIX0 z!ou<$tO6KxU%q|&c0@rz;UY+~0Vq?Zs;U}%>Cz=mfB*vkHxuewkZDJ(3;+NC07*qo IM6N<$f;?6}UH||9 diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index e0112fadb..96c2aada0 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -1021,6 +1021,74 @@ return scroller; } ++ (CPSlider)themedHorizontalSlider +{ + var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 50.0, 24.0)], + trackColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: + [ + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-left.png" size:CGSizeMake(4.0, 5.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-center.png" size:CGSizeMake(1.0, 5.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-right.png" size:CGSizeMake(4.0, 5.0)] + ] + isVertical:NO]], + + trackDisabledColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: + [ + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-disabled-left.png" size:CGSizeMake(4.0, 5.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-disabled-center.png" size:CGSizeMake(1.0, 5.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/horizontal-track-disabled-right.png" size:CGSizeMake(4.0, 5.0)] + ] + isVertical:NO]]; + + [slider setValue:5.0 forThemeAttribute:@"track-width"]; + [slider setValue:trackColor forThemeAttribute:@"track-color"]; + [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled]; + + var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob.png" size:CGSizeMake(23.0, 24.0)]], + knobHighlightedColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-highlighted.png" size:CGSizeMake(23.0, 24.0)]], + knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-disabled.png" size:CGSizeMake(23.0, 24.0)]]; + + [slider setValue:CGSizeMake(23.0, 24.0) forThemeAttribute:@"knob-size"]; + [slider setValue:knobColor forThemeAttribute:@"knob-color"]; + [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateHighlighted]; + [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled]; + + return slider; +} + ++ (CPSlider)themedVerticalSlider +{ + var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 24.0, 50.0)], + trackColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: + [ + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-top.png" size:CGSizeMake(5.0, 6.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-center.png" size:CGSizeMake(5.0, 1.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-bottom.png" size:CGSizeMake(5.0, 4.0)] + ] + isVertical:YES]], + trackDisabledColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: + [ + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-disabled-top.png" size:CGSizeMake(5.0, 6.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-disabled-center.png" size:CGSizeMake(5.0, 1.0)], + [_CPCibCustomResource imageResourceWithName:"HUD/vertical-track-disabled-bottom.png" size:CGSizeMake(5.0, 4.0)] + ] + isVertical:YES]]; + + [slider setValue:5.0 forThemeAttribute:@"track-width"]; + [slider setValue:trackColor forThemeAttribute:@"track-color" inState:CPThemeStateVertical]; + [slider setValue:trackDisabledColor forThemeAttribute:@"track-color" inState:CPThemeStateDisabled]; + + var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob.png" size:CGSizeMake(23.0, 24.0)]], + knobHighlightedColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-highlighted.png" size:CGSizeMake(23.0, 24.0)]], + knobDisabledColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"HUD/knob-disabled.png" size:CGSizeMake(23.0, 24.0)]]; + + [slider setValue:CGSizeMake(23.0, 24.0) forThemeAttribute:@"knob-size"]; + [slider setValue:knobColor forThemeAttribute:@"knob-color"]; + [slider setValue:knobHighlightedColor forThemeAttribute:@"knob-color" inState:CPThemeStateHighlighted]; + [slider setValue:knobDisabledColor forThemeAttribute:@"knob-color" inState:CPThemeStateDisabled]; + + return slider; +} + (CPSlider)themedCircularSlider { var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)],