From a368fe5825c2c8ee4bbc1a962bff838c6435433d Mon Sep 17 00:00:00 2001
From: Andrew Hankinson <andrew.hankinson@gmail.com>
Date: Tue, 26 Mar 2013 13:39:46 -0400
Subject: [PATCH] Fix disabled theme for Aristo2 segmented controls

Disabled state is now set via CSS opacity alone
---
 .../segmented-control-bezel-disabled-center.png | Bin 88 -> 0 bytes
 ...segmented-control-bezel-disabled-divider.png | Bin 94 -> 0 bytes
 .../segmented-control-bezel-disabled-left.png   | Bin 144 -> 0 bytes
 .../segmented-control-bezel-disabled-right.png  | Bin 148 -> 0 bytes
 ...ontrol-bezel-highlighted-disabled-center.png | Bin 86 -> 0 bytes
 ...ntrol-bezel-highlighted-disabled-divider.png | Bin 73 -> 0 bytes
 ...-control-bezel-highlighted-disabled-left.png | Bin 146 -> 0 bytes
 ...control-bezel-highlighted-disabled-right.png | Bin 144 -> 0 bytes
 .../segmented-control-bezel-disabled-center.png | Bin 87 -> 0 bytes
 ...segmented-control-bezel-disabled-divider.png | Bin 88 -> 0 bytes
 .../segmented-control-bezel-disabled-left.png   | Bin 156 -> 0 bytes
 .../segmented-control-bezel-disabled-right.png  | Bin 1127 -> 0 bytes
 ...ontrol-bezel-highlighted-disabled-center.png | Bin 98 -> 0 bytes
 ...ntrol-bezel-highlighted-disabled-divider.png | Bin 113 -> 0 bytes
 ...-control-bezel-highlighted-disabled-left.png | Bin 209 -> 0 bytes
 ...control-bezel-highlighted-disabled-right.png | Bin 214 -> 0 bytes
 AppKit/Themes/Aristo2/ThemeDescriptors.j        |  16 ++++++++--------
 17 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-center.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-divider.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-left.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-right.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-center.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-divider.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-left.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-right.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-center.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-divider.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-left.png
 delete mode 100644 AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-right.png

diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-center.png
deleted file mode 100644
index 121ca956fef46788404b4619b0e6256fe2a72eb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{O!2%?sX7+pmQu3ZIjv*Y;$q60_p8^wpoj-8o
m0E5!U#q|<O2C--SMH$4_ioTn;wMql1l)=;0&t;ucLK6U-ei;G)

diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-divider.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-divider.png
deleted file mode 100644
index 9b7b1a4fb4ecf7288e706ee31c85c754ed138e0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{O!3HEhOmL|OQmURVjv*Y;$w>(b9to4COz}xz
s+9WZd<NyEvlMf%&Y*hR9?(S|@29{#U$sWZV4nPeIp00i_>zopr08GXk>i_@%

diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-left.png
deleted file mode 100644
index 397896f20ef280d5a7d49fa07a9ca29310cbfc1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&D0V4NoaNhu=!aZFaLpWw8Cnh93NH$2Dkd*i!
z{e#(r2~QFe4U8sCc$S=ykT_w|14b`q$u&Mc{}1x83Ajohvo9+7`|o>yC+CrhZ(%Vk
sZ=MyGtNb_SV66Q(G4XZm;@v?Ex`*XHDTE4s0$Rb~>FVdQ&MBb@0MT4D1poj5

diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-disabled-right.png
deleted file mode 100644
index 1734b3eeec2c4898ed647153e6c0ff71190dc192..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&D0V4NoaNhu=qCH(4LpY+7(>l@w5-W~>n0(WC
zg8PqFk;BSjYHFEwY;D|bK0FQz2M;S8{Um=PAt@<=)!3ooS5N(u89ZeV_t*36KlrZl
uck4sR)A#G&@4Hibu%M6eg}ysm9UB{irjlw`=m#;7H4L7velF{r5}E)u*ECH4

diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png
deleted file mode 100644
index deca51ae8b6b5b3a0c4eeebabfbdd8bdb67685c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{O!2%?sX7+pmQnH>djv*Y;$%!5bC&LpG6B2&*
k^Zq@YuwdiEjHk>D23_Ju=QU3}4^+tD>FVdQ&MBb@0CH3rW&i*H

diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png
deleted file mode 100644
index d03c63cca6b71cb14134a1d921e7a38dfcc080c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 73
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{O!3HEhOmL|OQUabXjv*Yf$tej5GY(rgurRFf
W=MP(Ltn3ApWAJqKb6Mw<&;$VIK@XPz

diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png
deleted file mode 100644
index 7edcb08377dc74c62f0acb457fb8f6b85fff3798..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&D0V4NoaNhu=B0XIkLpY+76B801BpaknNJ@N=
z{-JDgz|+J;gQDpd9wa9uBu)r=_VYYL(gq`AM+qK<u8d>$o0fP4e*S&lK21&F@lEAI
u)(x}I&z<n+yaM-^qwZ~M)qDNC7#Vci6$C<>{5pV^FnGH9xvX<aXaWFZyEHlg

diff --git a/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png b/AppKit/Themes/Aristo2/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png
deleted file mode 100644
index 535f499e3dee50750cc21fb479f0b9aa8335c94c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&D0V4NoaNhu=!aZFaLpY+76ADruBr`CnnLD$|
zv(+g$Pd*>pbdcl3kMj%899CdWGcY#XU}Ui2PkIBxB8mSeCMkKIt#8}^U!tx#_QwnE
s!^R6v{PkClH<-ihY1L$N_y7Y#gNeeay+tZ|Kr0wLUHx3vIVCg!0OKYwod5s;

diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-center.png
deleted file mode 100644
index eb6ef4dafc7711be3074bfeaf67147fc25eaaedd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{O!2%?sX7+pmQgWUyjv*Y;$%dCwErrh<I&k2V
ly!5a3=H4@{FQ&$EGx&WHo5F49&;V4);OXk;vd$@?2>_9&85jTn

diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-divider.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-divider.png
deleted file mode 100644
index 1080d46255ca1ddef05e484c24778133ab5ea3f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{O!2%?sX7+pmQu3ZIjv*Y;$%dCwGkMbz6B2%&
mXHcCeS<vFna;PJYn_=oUp($+77qJ1AGI+ZBxvX<aXaWFI^cLg*

diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-left.png
deleted file mode 100644
index 2e553b1f59332f4ee448c9b53f8016e7206f6748..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&D0V4NoaNhu=l097<LpZJ{rz998r3<7#NHj@F
z4~WZHvGBkr|C)^x`?#2yPuI(p{`}A5aLhg}EsUd?(M9m&kJBIcw~NF)k<ZigVVjk-
ztiHbf|3CgG27iASeO2^mnfdbgrultulxlh$A~)=3SbyBqOXpf<Hqbf-Pgg&ebxsLQ
E0A$%Zwg3PC

diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-disabled-right.png
deleted file mode 100644
index 117cdd79575c696e09d5bcfe81ed097778b91740..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1127
zcmbVLO=#3W6pmGDQHupZQ9KOs;1AtRCYxltv8!%3ySlVn+wFquLD>Avc0-#?Or~zO
z7u!k^PhRxku|*K8coP(%MG*YCNR?hZ=|Kc9dJqxR)=9ft6^aK#er8_Y_r34EdGE?V
z|H<}k`?fI*)1Et}7U*{iefGAs()aF%SC57pk|~iPTp=~hLrluVIs!Rc8%71Bnf3F}
zQ8&YEu3E(sDdqbV1KUw8^oa(xOVJF|eLQeAV+0YPqhZTQvY#F;u)s2t>=`M~=iM}_
zTBpW6G&J5{G{#4agvlO12D$@<64;1nAh1UrUkQ@zDz8G<p_yaBstXxOvTLGB`2mo|
z9s*J{7BP4Tfh<R%D9JMH1Og8Qj;FUAfubVGiVz2li>1*#v!WE#Y$F!kCD|$=uEKG(
zS}j_OMX@)`!9*evatK0%dPMxXL$n~`_y?K{D)J4_a*2f<5He~y9wSMXDqTy#cJujl
zV#jY3ik6HEG?#->p0n*RuT^iK6wq%O8+!Z2x{J61^6{8w(DSGqXo6|&{v9ZEq-vDY
zo<$Eu8&$C}W+R8>)Fey)L`}<7c-Td&7#I1tz{_0_CLo_s)vTONrLr+u6`C9yVdX?d
zO!r8Vlu2bE%m_UYQfNAsO=P4P&x=iL&hd%n7^oT7qH!Bo@t;^F?IDd|uZZzzvjYaI
zm|(w(U63A<!J)inSWaj-93IeGzAEyp3&_lR*aoW=R;&#a@WS7jccr12RWm6*9?QnM
zM2T%+&Ht$yN5ybqd;HNZO%v_GaJk<6bhAD_$e}ai(cutoJ$*|D>v~R26@xdrC<w3g
za`{`!6K?X`!Pi%I9c<atSt@^DS-FTnWmwlVZE10F@Z1A;W^v)-%99%tvpc}unVA{p
zX8r7m{T*dp*Eh|Tr?yWp0~3=+T0l$d^77B#xxMAcvr5P9Y4P&A_?Mj>KQ>Qy^nLxf
zbZ6(pkC&a4XxV@N;`-M4`S}kg1|PTW=)D$fYU7#vpJ!jy@zNzKkjZ8G)q6eVsb4wa
BZr}g_

diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-center.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-center.png
deleted file mode 100644
index 746f31e3f66f53c0bd85a2fbc35d6012a4af0373..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{O!3HEhOmL|OQktGFjv*Y;$wJ?(W*iWCoxk9~
x5e62Y|NsB1yZrh6ou6NPxrEflqTg598A^j)swOQ>vj=Ko@O1TaS?83{1OV+e9*6({

diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-divider.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-divider.png
deleted file mode 100644
index 8658466dd53338d5e16638ff0d67c536251f88aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 113
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{O!3HEhOmL|OQWl;rjv*Y;p<M@g85B5<NVOHH
zl^0sGKXLKsshL%D<=CCm0yCB{BrdW2vAy!Z?d_A&Q-ajjF3#O<E&bjmSEF)W3(yP(
MPgg&ebxsLQ0I+2w$p8QV

diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-left.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-left.png
deleted file mode 100644
index 7bacd5c5e9e96913178c4bcddbb4f056b14f34f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&D!3HG7cJ^BXsTrOwjv*4^$wJ?(PB0v)ad^XV
z<f0D`56>TmH_53g=@Ks&FF*6;|NnaBY-LN%)JR1;u{1TcW&e42f;LV1W8=WdCXmK7
zY0Vj*9-jh63Fdx=3tS?MY=@#6j_j}h|6qnhw8wR(5-~?(34>4plP}-r+t>eBT$xbu
z?Z?sO`X{2!$?pH~<mg{@dAr7trY$urkJhT|+gk2VyZ&`I!`45noo{Vp<$-Qw@O1Ta
JS?83{1OPSSPGtZ9

diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-right.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-disabled-right.png
deleted file mode 100644
index 774e00456f346496550383fe8e34833d9a1beebf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 214
zcmV;{04e{8P)<h;3K|Lk000e1NJLTq000C4000>X1^@s67P*f*0001;Nkl<Z7*}Hy
z_Bt5Nz`*bfh|kKuDE!2jGwprd!)G7996R^u1yFD+3kx$7ld`N3A0v==<m^KumjD0%
zGk}1cBtH+3B?T8?Vq#=s`2U|3E&u``HUR-3MiF4Zs^#Cme|XHGmKGFuFc3C_ffPgk
z{skHK|2JIV@rzGifXrtsfByXa_xQ!<FDEZO1%>)KMn;Quuy{Ggcq-&00F@Y-n|y8h
Qq5uE@07*qoM6N<$g5V}peE<Le

diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index d4e7a3e44..237fb1d57 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -973,14 +973,14 @@ var themedButtonValues = nil,
         dividerHighlightedBezelColor = PatternColor("segmented-control-bezel-highlighted-divider.png", 1.0, 25.0),
         leftHighlightedBezelColor = PatternColor("segmented-control-bezel-highlighted-left.png", 4.0, 25.0),
         rightHighlightedBezelColor = PatternColor("segmented-control-bezel-highlighted-right.png", 4.0, 25.0),
-        inactiveCenterBezelColor = PatternColor("segmented-control-bezel-disabled-center.png", 1.0, 25.0),
-        inactiveDividerBezelColor = PatternColor("segmented-control-bezel-disabled-divider.png", 1.0, 25.0),
-        inactiveLeftBezelColor = PatternColor("segmented-control-bezel-disabled-left.png", 4.0, 25.0),
-        inactiveRightBezelColor = PatternColor("segmented-control-bezel-disabled-right.png", 4.0, 25.0),
-        inactiveHighlightedCenterBezelColor = PatternColor("segmented-control-bezel-highlighted-disabled-center.png", 1.0, 25.0),
-        inactiveHighlightedDividerBezelColor = PatternColor("segmented-control-bezel-highlighted-disabled-divider.png", 1.0, 25.0),
-        inactiveHighlightedLeftBezelColor = PatternColor("segmented-control-bezel-highlighted-disabled-left.png", 4.0, 25.0),
-        inactiveHighlightedRightBezelColor = PatternColor("segmented-control-bezel-highlighted-disabled-right.png", 4.0, 25.0),
+        inactiveCenterBezelColor = PatternColor("segmented-control-bezel-center.png", 1.0, 25.0),
+        inactiveDividerBezelColor = PatternColor("segmented-control-bezel-divider.png", 1.0, 25.0),
+        inactiveLeftBezelColor = PatternColor("segmented-control-bezel-left.png", 4.0, 25.0),
+        inactiveRightBezelColor = PatternColor("segmented-control-bezel-right.png", 4.0, 25.0),
+        inactiveHighlightedCenterBezelColor = PatternColor("segmented-control-bezel-highlighted-center.png", 1.0, 25.0),
+        inactiveHighlightedDividerBezelColor = PatternColor("segmented-control-bezel-highlighted-divider.png", 1.0, 25.0),
+        inactiveHighlightedLeftBezelColor = PatternColor("segmented-control-bezel-highlighted-left.png", 4.0, 25.0),
+        inactiveHighlightedRightBezelColor = PatternColor("segmented-control-bezel-highlighted-right.png", 4.0, 25.0),
         leftBezelColor = PatternColor("segmented-control-bezel-left.png", 4.0, 25.0),
         rightBezelColor = PatternColor("segmented-control-bezel-right.png", 4.0, 25.0),
         pushedCenterBezelColor = PatternColor("segmented-control-bezel-pushed-center.png", 1.0, 25.0),