From 3c1828251073d68b836272956c2a29a8de71dd8c Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Wed, 10 Nov 2010 14:57:21 +0100 Subject: [PATCH] add support for theme state rounded --- AppKit/CPButton.j | 24 ++++- .../Resources/button-bezel-rounded-center.png | Bin 0 -> 1028 bytes .../button-bezel-rounded-disabled-center.png | Bin 0 -> 1023 bytes .../button-bezel-rounded-disabled-left.png | Bin 0 -> 1408 bytes .../button-bezel-rounded-disabled-right.png | Bin 0 -> 1407 bytes ...utton-bezel-rounded-highlighted-center.png | Bin 0 -> 1025 bytes .../button-bezel-rounded-highlighted-left.png | Bin 0 -> 1439 bytes ...button-bezel-rounded-highlighted-right.png | Bin 0 -> 1446 bytes .../Resources/button-bezel-rounded-left.png | Bin 0 -> 1443 bytes .../Resources/button-bezel-rounded-right.png | Bin 0 -> 1437 bytes .../default-button-bezel-rounded-center.png | Bin 0 -> 1040 bytes ...t-button-bezel-rounded-disabled-center.png | Bin 0 -> 1039 bytes ...ult-button-bezel-rounded-disabled-left.png | Bin 0 -> 1451 bytes ...lt-button-bezel-rounded-disabled-right.png | Bin 0 -> 1474 bytes ...utton-bezel-rounded-highlighted-center.png | Bin 0 -> 1046 bytes ...-button-bezel-rounded-highlighted-left.png | Bin 0 -> 1459 bytes ...button-bezel-rounded-highlighted-right.png | Bin 0 -> 1502 bytes .../default-button-bezel-rounded-left.png | Bin 0 -> 1482 bytes .../default-button-bezel-rounded-right.png | Bin 0 -> 1516 bytes AppKit/Themes/Aristo/ThemeDescriptors.j | 93 +++++++++++++++--- 20 files changed, 99 insertions(+), 18 deletions(-) create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-rounded-center.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-rounded-disabled-center.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-rounded-disabled-left.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-rounded-disabled-right.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-center.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-left.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-right.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-rounded-left.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-rounded-right.png create mode 100644 AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-center.png create mode 100644 AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-disabled-center.png create mode 100644 AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-disabled-left.png create mode 100644 AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-disabled-right.png create mode 100644 AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-center.png create mode 100644 AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-left.png create mode 100644 AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-right.png create mode 100644 AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-left.png create mode 100644 AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-right.png diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j index 9586ed67d..50e170f99 100644 --- a/AppKit/CPButton.j +++ b/AppKit/CPButton.j @@ -70,7 +70,13 @@ CPPushInCellMask = CPPushInButtonMask; CPChangeGrayCellMask = CPGrayButtonMask; CPChangeBackgroundCellMask = CPBackgroundButtonMask; -CPButtonStateMixed = CPThemeState("mixed"); +CPButtonStateMixed = CPThemeState("mixed"); +CPButtonStateBezelStyleRounded = CPThemeState("rounded"); + +// add all future correspondance between bezel styles and theme state here. +var CPButtonBezelStyleStateMap = [CPDictionary dictionaryWithObjects:[CPButtonStateBezelStyleRounded, nil] + forKeys:[CPRoundedBezelStyle, CPRoundRectBezelStyle]]; + CPButtonDefaultHeight = 24.0; CPButtonImageOffset = 3.0; @@ -146,7 +152,7 @@ CPButtonImageOffset = 3.0; _keyEquivalent = @""; _keyEquivalentModifierMask = 0; -// [self setBezelStyle:CPRoundRectBezelStyle]; + [self setBezelStyle:CPRoundRectBezelStyle]; [self setBordered:YES]; } @@ -646,10 +652,24 @@ CPButtonImageOffset = 3.0; - (void)setBezelStyle:(unsigned)aBezelStyle { + if (aBezelStyle === _bezelStyle) + return; + + var currentState = [CPButtonBezelStyleStateMap objectForKey:_bezelStyle], + newState = [CPButtonBezelStyleStateMap objectForKey:aBezelStyle]; + + if (currentState) + [self unsetThemeState:currentState]; + + if (newState) + [self setThemeState:newState]; + + _bezelStyle = aBezelStyle; } - (unsigned)bezelStyle { + return _bezelStyle; } @end diff --git a/AppKit/Themes/Aristo/Resources/button-bezel-rounded-center.png b/AppKit/Themes/Aristo/Resources/button-bezel-rounded-center.png new file mode 100644 index 0000000000000000000000000000000000000000..2b147e6227c08d24a134ce528cc54c425eeefb8f GIT binary patch literal 1028 zcmbVLzi-n(6n0e!p-L z0}>02EX;@rF|Z-Q#DK(K(1n?)Vk%Nw$~jF6LRAMW+4tW0ec${2ths#a!p!W9AP5&4 zOSr|)DgItQe~y1|e0{mYk1MR+VJo!HhHgRx)2BTG8lk&NTEz7?AABKIL746b?GEcW zw+)YmlAGH|Sr~J)AXMkG*!9*313j`DL^W~u!zU30eoeeva-b7iWDqQEC1ho5x$SMO zc@#D6Ggl&@xW?9!z zv0__gO`BjFQOexNBNM*?_dCWG&%_#5LR?0ZHl^#631|)|qv?Rgz*;E*$Mu3J*Yoxq zXNyS^JS4uI&=8F3YXqnGhsA&Lh8D6kwWO#jF5z-r9Ao|eshP}!k@MmBYgi^%d;)Xv zWc0amvOFZ>8HV%6n9mG5TX(=0n^Eajo5eojNO_l^~E$&Q>ru)85rW&m&R)BGxn9Z9VlW! zY;61ojO>V^Gg77Q9bjZ+U|}ogG%g5L9k68Id*}E2z3;c18;=*R-@7gd!a{2eclbHS z-#gc?^6%2o`xAcLWz8PjqC+%ah4Ony3=Zwq;~lR>`3#HEvPM z_Y&q8wIpAx7%<6$EJ|5K6Hqex1G>u`kw&v?p{jd4$0|m7Vv%y7b`HY-Q|u-LmrL&B#U@c{4u7%ZcGx^!j8!QNMRJ( z5Y-_$u(&XV~z6Y9{kwI?eIW_bDwUkpPrt+xjlL|zVh-x?`VFm a_DYx+jt%Yp;@73)awS{M4g7Jn|N1vT20M}f literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/button-bezel-rounded-disabled-left.png b/AppKit/Themes/Aristo/Resources/button-bezel-rounded-disabled-left.png new file mode 100644 index 0000000000000000000000000000000000000000..839fa35d7fda0faee1161a194bc6426a08f706cb GIT binary patch literal 1408 zcmbVMeM}o=7(XZhMK-c9rX{%D4iyNr_tExBZNSL!HkP#u((7`WPS{iWhQ`t5vFdqk0=o(W0^(`{|KfdxY<#!K+zboKfL7bectzd ze!u7YIxEUcw!Ee0s;w2Ei5D19qeK)mf+HY~Dp8eMtJUU%7=j`&g25=JK(&MlBM=1Kcp%A| z;Hn{PqPT6;OD5SuqBZ@zDb7 z6ZN$l}$BuYvd9H6`~szhLpi^jF4?GtUxKW=QP?Xx#} z8Q8}7_y&QN>QR#w153Gku%W1;c(yBk>afmp&MFqFs(cAj^~I-sJC7kOVD?*&bj8qiA7tS7pUmS;U$k`dUK z8JAh$IdCn%1iOWOMD?Gz5ff^{)f!B#CN*S13ABNA{hyq{k~46$IsVlwu_LJiqvB@k zOPkH%VLZ~r2-0YLaJb740C9sB(r6F-=yXk_&YlfE-qG6{?A_5_JfBs1Vm3D~Z!Q!H z&7msQBft=ZPci;MfMn4TK`yCycKyjZ`Y`Q@kn~b4Sz6R zoId_uaOLWmeb3r#HpQ{X>eNDRF!AD)J<0M+e8oS~7cb4}#xK z;DgJ{%krhArG#)K@=n{?#H6I8BAHCK$GNjz6aH(ZJFRXw?ncILebeOh<;&;D3$H#3 zA3+cdOHTVZu0!5=IA!}Ya=H8|$Lx64bM2>2rH8&hfAoB-dvBtux34eq%Dp=adz~62 z{@d>0$&)(_Jw;b0Cnul&$}*jnT^@eeo}eyOK)UmWMp*mx5jRsP`%|K z+D?xRkBk`Nf2FsVmVWu>+^77CEIm9m5O;3jvw?wy7aSc!?)lNivHt%4`I!%^`ihRN zHm3wRzHP?g%f9|Z4fy2!+g~KzRy=<(EW4Mwvnq0}Ul&RRCjgs1XXf<_*WZu+6D=j> KDSr z1<%~X^wgl##FWaylc_cg49sbnArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XP}#GU}m6TW~gUq zY+`P1uA^XNU}&IkV5Dzoq-$tyWo%?+V4wg6Nh+i#(Mch>H3D2mX;thjEr=FDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz zEwNPsx)kDt+yY-;xWReF(0~F4nSMoLfxe-hfqrf-$X{U9#U(+h2xnkbT^v$bkg6Y) zTAW{6lnjiIG-a4(VA$ce2&53`8Y};zOkkuW=D6f1m*%GCm3X??DgkBmQZiGl3=Ay{ z3=Pdq49txT%q$EIEe#DUU0mGE+#DU-0n3=)!dgc|EB<3Zj!tBii+6&cdiC3?cb5UwyNq$jCetr%t1q5W|m*f{` z^Cq*^S6Psp|hEZsga3^ zi>Zr+s}fXi3OQk>4|I$^C~+Vq7MKt)1%jCHqz~l4Gf!$BFvk=Dvj$g{@*V~T#`T^q zjv*DddM5ABKI9;BTwmPvh=+H#f70Rp>1R!rdg%I-GtR#5#B`6s`6Lnb7>vi+g9^YrgM)!*OE^WgaC#CL+TQ=pkA zDfRTzNxo{6r(ewYa^r1T{;8)$T$kA=)M^{d^_#iwwf5OGW3&0^ZzdS*2p4%OvVZB? z1MxEr?&XGto`1M$|4V%Z*|e#8OQ&qP{kA*7prZTXcP@$k3tIdiJBc)o)t6FV@Db zj}KjaHA!vq#WOFaF{~?Q^i|#-wKmCYw(Oyu`{S;r*$KQY-562xrE2f;pp{=5e9Hvx zGOpPCa*tKk3yX;!0sY67mjr2Qo!<1~`|te*_am2Y%(Q3XVQ7`vX!ff4^L|i~=;`X` Jvd$@?2>?B||0)0g literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-center.png b/AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-center.png new file mode 100644 index 0000000000000000000000000000000000000000..1b8d4ac2d37a891039e3f8bced2741e7b44bb90f GIT binary patch literal 1025 zcmbVLzi-n(6gH}api*~WI=L&c@0`SrP2J+yF%7~YN+LC5FZQLeTKkNBC2j_&nBXs9 zU}r&MMq*$_>W6lG%N(3vQBLdnH-XT4LgM&vO$(kT6jl;o^4ZR13Pa_Ez zHc}oX94!cI8+n5LUBbYK?1Zr?p1%Jef-o?}t-1%j#3qw)bC#0+tTXUuyS^TX8|z># zH#k8=7zTN?7iUIpigR9r%f+=Ug1HIXHO2FwhF%xgG$o)e!HN%62vj7YYE9F$+dzQ` z%21J!QbC$gRSXEh;t{#GG#DE_$6fg1nkh~gOAJ|_PN&keD$#UDM!K#S9Ewum7M1KE zW;n0J*=ot)kjziRgoQK)1tT8OeP)V0((@Fe#PcqQ<7`nVUNSkyiHsyDM^Ta2+&W`D z@+*u>t+T;FLgXIF=zi++evDU3Ft6Re9TkQ=8slLa@}}TDhx+>wiCNn*MgB($!oYy2 z0TI$_P*b4VKuAYWcN|xBEz7N{j#6@5hSi$&2833#RdZE@9M|H4)zDN_)m^)xswK7^ zXAH+aDgB1r?*dyu{*E>5lwd~F0i}E81av2q(QHB!VE605!+sbSdeNTqY#ow@k4fOB zGy?Pb8sR1WVfBx^p^a>{R#$2@r|vXb;sP7|Pt9Z=j9d)IZ^Kev@d+%%i_z!G#qyAt zZ%oQp1D)YFe63L1u?G3^sJpdAx8KdapFDkicKW#rk)kxOgS%t=Wwe@{9KJgG@$GBh aJrtIN4qJXQ`gH$!v6Ssr$9db_e)bbf=RZ~e literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-left.png b/AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a07ea1ec33dfdbc97decc1de756fe371c4258a0c GIT binary patch literal 1439 zcmbVMdrTX396w-b*o62NnBp#70Zq%5=$+Ec3^+Z20|6f`QgFcMWd%H7kgn_EU>@E^r0_aK ztT0G7oU&Q+U=zpFuv(7F9H<6`HJBVzsRg z!V3uVrY*2CNIjzH#}TBarbb?)lykfr!Ss54SVN(Z0fbDbWko6=V}-pD1%ehFJmVJ` zj)lXDl%1;*4N~CgMhHH?#j+*L3Y&=nDMJF3AHn1(;`4>$T1N|F0sW5~+oA<)t)E5; zXo0KZ9iSery%93V-NOxqfxsL52+x3`P+o#_RQYIDBng8QoXDMw6Gt%}ieXw6s#TyG z9fs*KR8J6QjoD~4D>Z~7qOl!Uo2AyFs8O4(GHWo5FdM{?Bs|c*(IX_;dVYBLHvoU}SQHLbKwlM3 zO-!WCj*pM8ULPuhCv`E=p9GtmuUwg%n>*3f)paTem1Ao4I|`*z*?H#73=Kzr_8=6x z-`(9^aZ8Y#l=No3Tv=Jkc%L6XcWZHeEc(DvqGdE{AlTf|(Q)djRO~XEzq|3nwH@Xa zEj)RsO_GwIKlA8;2XQx2E+!_fp5Bul@W0`SZ*Oleo*gP{h< h`g2ca!`+xz6q^f$NC1atrZ literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-right.png b/AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c4d248bd21417038fdd3646a0288e532a5d283b4 GIT binary patch literal 1446 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eL!3HGH8OdY;DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49sbnArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XP}#GU}m6TW~gUq zY+`P1uA^XNU}&IkV5Dzoq-$tyWo%?+V4wg6Nh+i#(Mch>H3D2mX;thjEr=FDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz zEwNPsx)kDt+yY-;xWReF(0~F4nSMoLfxe-hfqrf-$X{U9#U(+h2xnkbT^v$bkg6Y) zTAW{6lnjiIG-a4(VA$ce2&53`8Y};zOkkuW=D6f1m*%GCm3X??DgkBmQZiGl3=Ay{ z3=Pdq49txT%q$EIEe#DUU0mGE+#DUxx&em2**QVo82cNPd0}ECmE)l7#Od4 zx;TbZ-0BJT^=1kbshupJG2yXNtO)12m@O9=T|+K7+>&sz{+Pa_RP~28OZ3+4%d3{S zN=sk7=(^(Uif)c}owGuJ&KRcd@)x<{^ZY<++P&K6`;5Qeb)Mm~jKgUKpJB@b#T_@z zwWgoW5M?>NDQWf9RsC+t3!~P4I+-#lSwf9d;bJ7W{IU5Nh)zLX^Ln@K8}w~Qv;neU?(b&_Rk)Lw3usVRrv z@J&czI&;f>&L`!WKxMO{)@}nbGECx1tzw;vq7wzW%XaTodC4O2{Y`>_221n7=WEUH zzW+XZW5k(8X^wVEiW=lr=iYSWNeRo}RB%96o{V7J0c@{F876z<%Q()oMJ$v~)J{BgyUboAP v%^Yma4==y|y03Y6)`Zn(Q*|DNH!w0h);KC$_3r+4P|4}(>gTe~DWM4fs*(<1 literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/button-bezel-rounded-left.png b/AppKit/Themes/Aristo/Resources/button-bezel-rounded-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6b2617414db55c19247d9fbbf5f41dd10947d0ce GIT binary patch literal 1443 zcmbVMeM}o=7{3)PWHJkjG2lo%50(8vdw2crNo8%1jtYgQl!#j*J=!ZhXnXbUpoK6d zi$jqmCi@5CP+a0j42x0Yx)45w0^wt9&fwQZ42r@W#6dQbeH5&3fub?!A6|0zzVF@d z<9VLBC7dzqppjxKL1b-0@9Tsk*W@B*A4CV+sS7AQFE_XT(&tVcF=2{4bp zMiF=uBGl=Tt)MEcHrT{+G^~2X z1h{c-4`Cn24Zv|ls+z4A^azM_D+PbhYTXeI@Y{s~B}2nh5XEH}>i5U<+C=k$o&GC~UD3Rw zF-W6!nrG`d7uXL^PJ#?-_uocwAc%%2;~20hl#gUx^?o`aSV%nrzR28+o4{}_hT|F~ zrjcW6EspDOOh=Mtwb@`WE7YVsp|KlRV^m?J!H5+q&1xJc%?2OPDyC5?Ic`vc5zI*u1R3@?JIwo61$Nm2xqG_&UBl zTiKE{$28DxGspVj&H56|F8-L}A9-UY+@w~jFJ5_@n^3+9?Lap}sL=y3CcJF%Z9-j2;* zIv$JtFc6B(4_F6k0Xh3~~GMF3ZuQ(G41gkC+^euQ!&Lmxm7397}m{GTrk^#CQFk zqULImLZP@jIW@&Rog4CHb`O5pQ-HE8yNdBkGienS6^{vEV9RT@>u0*Vo6q+4F16Tf*Iu8y$o7n%Yt8DCI3pVkg3v4}xscc2-+!<5^9{+b zxhij@@Rv{?J`-L0$@IO)5TASeIuz$qErmhpFCocW?VlJ|7}_dOUaLn&J%wEs<{>j literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/button-bezel-rounded-right.png b/AppKit/Themes/Aristo/Resources/button-bezel-rounded-right.png new file mode 100644 index 0000000000000000000000000000000000000000..04c7af05f5a4aea430419a34b1aa1356764047b0 GIT binary patch literal 1437 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eL!3HGH8OdY;DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49sbnArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XP}#GU}m6TW~gUq zY+`P1uA^XNU}&IkV5Dzoq-$tyWo%?+V4wg6Nh+i#(Mch>H3D2mX;thjEr=FDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz zEwNPsx)kDt+yY-;xWReF(0~F4nSMoLfxe-hfqrf-$X{U9#U(+h2xnkbT^v$bkg6Y) zTAW{6lnjiIG-a4(VA$ce2&53`8Y};zOkkuW=D6f1m*%GCm3X??DgkBmQZiGl3=Ay{ z3=Pdq49txT%q$EIEe#DUU0mGE+#DUM5Ivvk%ANZLfKuG zpMO5_@`6WNl#bXDvz4p7D)!#vgJ0wXwQxfW&qa?1w zpeeyKkNL&6GtY~emfw8)E%}FH8TX<>Dc3+A8G}~dh_zu=Ml;_e>Ss>9(ejodebJ2^ zGa+dS9=7>>?T^`|UzAwoPCvag;eBK3%`6LZO@x?oq1#U+wZ030` zzpT6Edp%>sx-hM&^O85t5a@NAospy6U^M;oQ>EjDIST_S9B*zH3s@Vb&BoMd9VjBN zFrztIOR{qsU%+|!4-y({!&Y;OhBa$nIPtV7R^$A$st=#8GQ?WXJ!d#)(X)>gDK`@C nzyIECpy#k**Uzj!Tm}p)ZnsQTP|cVHDlk1={an^LB{Ts5tL^^M literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-center.png b/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-center.png new file mode 100644 index 0000000000000000000000000000000000000000..1d540df8e1891cf7b99e6eb933f85b96d994c23d GIT binary patch literal 1040 zcmbVL&ui0A9FGiiI0hc4mp!t}K%2amrb&}6Ze3rq73>^c!QR$1d0oSnyqLV%Y>1+_ z;l-Q(fb1lm6~Uc_c@i(X`41?b23EnBuAL%d2Ls9beqX+y&-eHK+UoM;)f-m@L71$r z;5t7q@po$cGXKsUy*TE_byjJzb=qM)CniG4qiq7JfwM{K#PN3Te<1UMFxK%KP1da4 zFDpw8U@k4n^R5mUypFgSDtky8g;uOxE{S8}8ng zYk1;JUoHQ3EGb08}5;yiE=F<>lj82>GFiYf-o~95)wb~hRm<$WWOD3mIBqIsR zL6GG&uufQ={0ZY+>!h(85xGthx)Zy+ADx*InAh%NN0}jy#=IN*yeZB$rtVHaLRQ6= z$p1*5@0k!4Aws$ebp>iggbV}?jBU*>mF&ERl@Z5zSba$|R3mR!R9iy`+a)fPin@mK zhFvad+6Y?>6Xt|28Ts|O-yybgA=WI%#9=gUP`W*ufVD1VH0ja^l-CQO=D2>C=~;VD zv&AI#9}v%uX#fWGHT`q^!~8#a!!jysYC%y|T)@SOIK+DYQ!|+dBWJ_$*RYJP_ylI+ z+30iSY{@@~^OJ+AkF(FeAN8jn)~}31VdIm1^X<#`gB`6_R`Khl*3;ikS4G(X literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-disabled-center.png b/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-disabled-center.png new file mode 100644 index 0000000000000000000000000000000000000000..f651063a9dcccb502af2f08c42d34f3e7bbc6f8a GIT binary patch literal 1039 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 E-y3{EqyPW_ literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-left.png b/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4a292a1b5dd748d86976c8c0a9080c297f11b11b GIT binary patch literal 1459 zcmbVMeM}o=7(d3uv48{#@}VZj4T)sX`{);~l+yKD)`TKL4Hz_X?H#m(-j(ZN3q#mO zoJ=-1#6=dIAY#}u0i&S78OJ{S0D+N!1D9-_;KCG^;b6)#w)z$*8bkJnm)yP2`@YZb z_k7=h?5vE?t+87n2nsdqBy+$T0^aB?LEt+=JhclfF@i2%$mNOz7sWG>hUUx+Y_L#mf1l}m0=WU=UR4K_>%Iyp*7)TWYZbY<=R$_PxhU0Px zCMPgi3XUsqOhJ-*nO>vOi)AF?=hz4<-ytV7QjJb0(aUh0)N6pCNs-HNu|ls+k;(j6 z1M3th*24Jh+JN0PEcsBZQp+=x!0{%IEA@9kwv`h&r3?6Mo0K_TOcT4+CXYd?#t$7uU8$I)^CmJ3T_wn=7-hwz2w+_5K27Q zJ34_+Oqd$8^WKe^p^GiwkM>(52R662C54nf{&J`B#mMXQ^>6MkpP#=u!R-$_;}y4B z3wz!!G8fW=hi{i1;6EdzRo>I)%c@7@L+i#;)UdHlk!KXtSe#wF+z=3=Am z)8k2ty<;JZLV4PQrAK<|!cTdw#ZFF6wsjg0nY=jRyp~-*+JECnduw+WofMb&;ScH1 z9_f6UvmjaaN)?g zdQGhP{miWHD>YN+T57!2;UCBSJUn;u*jLL(Bi`eVZyPkE&vzt#_xi=#uVg&tsajl2 zh`{h)E?}P1H%_H~670HqguxQhK7cK zr^RxK1b%dZ<09@v4Gm?g3-accvk`gfxBZ@!i5`;8iO LS!CCa!hL@OpO+!U literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-right.png b/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3ec6dddcd665237ba81e3fecb1dc042bf9425b54 GIT binary patch literal 1502 zcmbVMeQXnD7{3mjKvuG_5D}PMiqS;Y-d#Vg?Xj+Oy>=_19hN3Eek8s2-gYNzuU-$@ z%|R(_s|1zsA(4nqNBl#A%EuHK&MpMffjGmAlE~L!vKVA`IL9X2dS1th#t{DSlDqeL z-}m|bp6}bX+EFE)vv3XsK~h^a=@i!@@m(;hQ2h2N7r!PhPxBTxzlQbmQHleQiDtb3 zwgssGZ~}_1fBhUNhoBjL#^vVS_Em(B4JxRdjv^Kei)aWcH^#!0Zyn%aF9p~GCW{^$s5~7?t zMr81m3ct=Ed*GDYz8W^O9Dp?nRPIA@6vi&)Vkm+t5lkt^w1i4YpeQ{3 z$V6)#?I)b1b=sD=GstRrK1?7;G#XVzRSK31AedgS&v7V~a#2GbsSoi~Odg6X%`=c7 z;^UYw&#)ml$4GhE^}InQdio%QVAyVdNF0hxCrV5i5~IQhra+NkFc;U9c7%6=f82Pa zcEnX528a_x*!7%GtcQPT9xUeW@rH7WqBleh$B0Ft>PXhNJ_tg*jWo!_8wJhK1d8cU z4AZJntrEp`7^cTiJxN+|tI1?l;iNLp@hGgeQcG$~8mmQZ#W9Sunnb~*)8d#)Z#C<1 zJdd@7B0LrHfxKNtv^$NpJQhosIY99&=VIBqdKZD3GbOnzg)3&?6pY{O zk}UGPvgyu%ur_loCHysfDRXK^Yp1^9-p&4H$1|k`=jB4Y@$AMTseO?n8wgN-kJn50 z(SYi^MS~L?#;;v1O**cejP>`l3+cUV zdx`w$%nj93O$$Cd@QJYGRie~3qoiedd?K43+L}mQzSw(Z&(6eM;{p4HV?x#5x|!!B zKh9_l_eED+E*jza&HG{NWu4`4A?)c&3aVq=t#p<9$dMz>CJm}AKCL|3`@-#&f8cM; zwQ*$^+!LFn@7-p;H8$Qm-|_@4$5y!9?xw`f7xy)9+ozLmDQKK93fU5hdak!H=sw54U;rl!51?T8d`I8ghscR(j zm&}~gS$VFFt=LpQIhg)FbG-HI*wN8DUoMZwg^qR@8EZV$nVnCc?d$f>I@k)IPLF)J x{q2$D-b24`=e4_&692*-39g3fSy2c{3L&56LX)rk{ZDg$T${x~eqQO>@;4NYL686d literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-left.png b/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-left.png new file mode 100644 index 0000000000000000000000000000000000000000..127c8965833a660f94d51c7add58cb1914fd014a GIT binary patch literal 1482 zcmbVMeM}Q)7(YS=PKxP}0TU9>V{Wq9`{;K&N-aGqowhn)v2Hp!u2<-wcjfM&RWlkS z*@lws4>qTZlPx1*AM!EXbVRgfV`g&-LWbQ8vzo;*laWHi1+Cb(iI6SPDTSF_d#>{dY_u1SPxN6%Ns1+o-2G4@$*#P`}3u&=6E;^m{3~mJ#79rrOOKkjTj( z0=u0CWQ)p%+q`C`#$CFLXUcckE9hOdw9bhbi{L`P9uRmKk%Il6I#$s84ahvN9?0=y z41woW#99M#-zkS}Gi>H~23DcCjK8KN z0<7^)m%fa&EZ71&15zW3UOk5Sd_L5tKsmk|BXl}loI@^`0S%e3lNBkyj1}?|3?w7a zyxS|fITnsHQdL}oXh49c_e1b_ZMH>XR#-?BNEzm*ycmJvn8y>3YhGIr%b361c%ZgW zvD3?7WsJZz@HD80D?b4Sx%+QJaYf*beiQEoMWO0Qj&ATUtY{?-2)IF=Zl@k6v^YU% zl(s>AegioHKEX1%v!ZN zfwi)NNU=1NuZ9Tm{=G+ReuI@$%e{ zmSlK$BjdF2oCluIuipIt`?%sCapPvftX8VzN+qcxwI#>`*7<*Oh5=`=cys)%SrSK} z1LNXi>x0eW@GvZx7#@tq?6J?mR3+W9lBNp(<*K`}m@yeWlQX&|tuyoe1Ie#Hw6*Uk z2@4g7dmELt|2dny0Ol+e$ZF_omFm_KaO?Kqmn=6-QTy00rihZv}jDglEzW(9m-Pc0BJI0T! zJ%6ZE+j=_^4oYG%MMhWidvD(eg(Ak&LVe#&>4(kMwvOoJz7V&grEXPq&&Bc4Au5(j@zv>e-FgbYp`)t#yk|m0yx#=!lLFL4L zL+Tshf#}s`rrdQ!K4PTFk#(d0l}ks*QaeuhZ{1yavHMG0Fq@N0hXbkR3lp1OI>j73 z&F8o5Ino9jSN1|{gb(NgDbm@=YI^4P;f`RqOBNnHKQwgq@zv-PN$1dSSLA&5){24b zNZ}7{wePwD*RRlqCv%@xsaBV4wcD53lZuLxEP3BZ6w(bV`~Bvg-8WocC_<5so1)YE gqF=w$i$F;!(4#lG^wHk_zWCqOT4E=AiYxd02~9RA=Kufz literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-right.png b/AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-right.png new file mode 100644 index 0000000000000000000000000000000000000000..72aa04c7261941af7f44b8c1452be9cd2bf7ef62 GIT binary patch literal 1516 zcmbVMeQXnD7{38)aBO2}M2FK}ZaPrb-bdTJ_FUI>y&Wu2oMpO6OtxElrDgQ4TyJYP z=e}6Lp2qBZNLYU$xItcxj5^@)%Gv;sX9{>3do?S9RqSdvXM{$M zgdouEFhXTID`NFpSeJWgy}+)lUr}nWueKW;kSQO`3y?B_hZPwx;91N0$bb==;w5D{ zehfq46hy2xLie01x0ZkwUSL6;8d2F19074ujcT+6LF9rMf+8@2!6>Fe2~vZR2m($& zkZetGI7u5tPur4rM#v?KUJ{1=e!tqUQS-uT7&RCSaSjYq$q1FNjuV-Hit}YB7%0|f z7u;Ua&2wO!k*VTqL?a}7dM^Zz*J`~_%=xAhC8rDyFkTo{Be2I4k829;6K(82Zafg} zE3Nagu#NTcHG*BPhci2&Ea&dwhT=fk8}cQ=Ef){9 z#hg!MI6IrL>z3^jg}6a$&|(kOB`pHWh`dnB^J^0wP~zf6-sj@Ipk<{Fv@&)#7vIOr zb1zzo72LI~gBExXIF(=0{Q&!j=09;G7Sw`kb(mI5=_q{>G_C9SKRJVCXW)2q{Hs|K zM{)Wo-YlvO_yRZ%kd}&v>iigs#ie?D{_X^UbDO zC#}e#6^iuvwBngpb2fzUbOv8LdgpAvYGIE$`BOvs#eI9{?PA7{!P2?z-)5|-lBDrd zdkS=GSh=DE`3Kp*ijNWQy%OMlw%?oboDqb+@R-*c%d z?c?2qLXCfOsLJyJhR!%Oc|g6;Lj?xIL*W z_iQlK82d#rSPM?Y5=`spJQjFf zed5ocYvI!d-w?NN%dNUyg*VQ0A1RY!cN;&~wh@+~p&98hJdA;q~{Hz7}jdv$*Ph7Z3{B%5Ucyugy-2@H)niv2778k9c_7+yQ{tfS(K#>3d literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index ee2fdc19e..499f6914e 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -337,7 +337,8 @@ var themedButtonValues = nil, + (CPButton)button { var button = [self makeButton], - + + // RoundRect bezelColor = PatternColor( [ ["button-bezel-left.png", 4.0, 24.0], @@ -353,7 +354,15 @@ var themedButtonValues = nil, ["button-bezel-highlighted-right.png", 4.0, 24.0] ], PatternIsHorizontal), - + + disabledBezelColor = PatternColor( + [ + ["button-bezel-disabled-left.png", 4.0, 24.0], + ["button-bezel-disabled-center.png", 1.0, 24.0], + ["button-bezel-disabled-right.png", 4.0, 24.0] + ], + PatternIsHorizontal), + defaultBezelColor = PatternColor( [ ["default-button-bezel-left.png", 4.0, 24.0], @@ -378,13 +387,56 @@ var themedButtonValues = nil, ], PatternIsHorizontal), - disabledBezelColor = PatternColor( + + // Rounded + roundedBezelColor = PatternColor( [ - ["button-bezel-disabled-left.png", 4.0, 24.0], - ["button-bezel-disabled-center.png", 1.0, 24.0], - ["button-bezel-disabled-right.png", 4.0, 24.0] + ["button-bezel-rounded-left.png", 12.0, 24.0], + ["button-bezel-rounded-center.png", 1.0, 24.0], + ["button-bezel-rounded-right.png", 12.0, 24.0] ], PatternIsHorizontal), + + roundedHighlightedBezelColor = PatternColor( + [ + ["button-bezel-rounded-highlighted-left.png", 12.0, 24.0], + ["button-bezel-rounded-highlighted-center.png", 1.0, 24.0], + ["button-bezel-rounded-highlighted-right.png", 12.0, 24.0] + ], + PatternIsHorizontal), + + roundedDisabledBezelColor = PatternColor( + [ + ["button-bezel-rounded-disabled-left.png", 12.0, 24.0], + ["button-bezel-rounded-disabled-center.png", 1.0, 24.0], + ["button-bezel-rounded-disabled-right.png", 12.0, 24.0] + ], + PatternIsHorizontal), + + defaultRoundedBezelColor = PatternColor( + [ + ["default-button-bezel-rounded-left.png", 12.0, 24.0], + ["default-button-bezel-rounded-center.png", 1.0, 24.0], + ["default-button-bezel-rounded-right.png", 12.0, 24.0] + ], + PatternIsHorizontal), + + defaultRoundedHighlightedBezelColor = PatternColor( + [ + ["default-button-bezel-rounded-highlighted-left.png", 12.0, 24.0], + ["default-button-bezel-rounded-highlighted-center.png", 1.0, 24.0], + ["default-button-bezel-rounded-highlighted-right.png", 12.0, 24.0] + ], + PatternIsHorizontal), + + defaultRoundedDisabledBezelColor = PatternColor( + [ + ["default-button-bezel-rounded-disabled-left.png", 12.0, 24.0], + ["default-button-bezel-rounded-disabled-center.png", 1.0, 24.0], + ["default-button-bezel-rounded-disabled-right.png", 12.0, 24.0] + ], + PatternIsHorizontal), + defaultTextColor = [CPColor colorWithCalibratedRed:13.0 / 255.0 green:51.0 / 255.0 blue:70.0 / 255.0 alpha:1.0], defaultDisabledTextColor = [CPColor colorWithCalibratedRed:13.0 / 255.0 green:51.0 / 255.0 blue:70.0 / 255.0 alpha:0.6]; @@ -397,19 +449,28 @@ var themedButtonValues = nil, [@"text-shadow-color", [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0], CPThemeStateBordered | CPThemeStateDisabled], [@"text-shadow-offset", CGSizeMake(0.0, 1.0), CPThemeStateBordered], [@"line-break-mode", CPLineBreakByTruncatingTail], - [@"content-inset", CGInsetMake(0.0, 5.0, 0.0, 5.0), CPThemeStateBordered], - [@"bezel-color", bezelColor, CPThemeStateBordered], - [@"bezel-color", highlightedBezelColor, CPThemeStateBordered | CPThemeStateHighlighted], - - [@"text-color", [CPColor colorWithCalibratedWhite:0.6 alpha:1.0], CPThemeStateDisabled], - [@"bezel-color", disabledBezelColor, CPThemeStateBordered | CPThemeStateDisabled], - [@"bezel-color", defaultDisabledBezelColor, CPThemeStateBordered | CPThemeStateDefault | CPThemeStateDisabled], - - [@"text-color", defaultTextColor, CPThemeStateDefault], - [@"text-color", defaultDisabledTextColor, CPThemeStateDefault | CPThemeStateDisabled], + [@"bezel-color", bezelColor, CPThemeStateBordered], + [@"bezel-color", highlightedBezelColor, CPThemeStateBordered | CPThemeStateHighlighted], + [@"bezel-color", disabledBezelColor, CPThemeStateBordered | CPThemeStateDisabled], [@"bezel-color", defaultBezelColor, CPThemeStateBordered | CPThemeStateDefault], [@"bezel-color", defaultHighlightedBezelColor, CPThemeStateBordered | CPThemeStateHighlighted | CPThemeStateDefault], + [@"bezel-color", defaultDisabledBezelColor, CPThemeStateBordered | CPThemeStateDefault | CPThemeStateDisabled], + [@"content-inset", CGInsetMake(0.0, 5.0, 0.0, 5.0), CPThemeStateBordered], + + [@"bezel-color", roundedBezelColor, CPThemeStateBordered | CPButtonStateBezelStyleRounded], + [@"bezel-color", roundedHighlightedBezelColor, CPThemeStateBordered | CPThemeStateHighlighted | CPButtonStateBezelStyleRounded], + [@"bezel-color", roundedDisabledBezelColor, CPThemeStateBordered | CPThemeStateDisabled | CPButtonStateBezelStyleRounded], + [@"bezel-color", defaultRoundedBezelColor, CPThemeStateBordered | CPThemeStateDefault | CPButtonStateBezelStyleRounded], + [@"bezel-color", defaultRoundedHighlightedBezelColor, CPThemeStateBordered | CPThemeStateHighlighted | CPThemeStateDefault | CPButtonStateBezelStyleRounded], + [@"bezel-color", defaultRoundedDisabledBezelColor, CPThemeStateBordered | CPThemeStateDefault | CPThemeStateDisabled | CPButtonStateBezelStyleRounded], + [@"content-inset", CGInsetMake(0.0, 10.0, 0.0, 10.0), CPThemeStateBordered], + + [@"text-color", [CPColor colorWithCalibratedWhite:0.6 alpha:1.0], CPThemeStateDisabled], + + + [@"text-color", defaultTextColor, CPThemeStateDefault], + [@"text-color", defaultDisabledTextColor, CPThemeStateDefault | CPThemeStateDisabled], [@"min-size", CGSizeMake(0.0, CPButtonDefaultHeight)], [@"max-size", CGSizeMake(-1.0, CPButtonDefaultHeight)],