From fe6a576d84257ecee4cf1ab17d193fe796208df9 Mon Sep 17 00:00:00 2001
From: daboe01 <daboe01@googlemail.com>
Date: Sun, 31 Aug 2014 21:16:36 +0200
Subject: [PATCH 1/2] add special close button for inactive windows

---
 .../window-standard-close-button-inactive.png    | Bin 0 -> 1536 bytes
 AppKit/Themes/Aristo/ThemeDescriptors.j          |   2 ++
 2 files changed, 2 insertions(+)
 create mode 100644 AppKit/Themes/Aristo/Resources/window-standard-close-button-inactive.png

diff --git a/AppKit/Themes/Aristo/Resources/window-standard-close-button-inactive.png b/AppKit/Themes/Aristo/Resources/window-standard-close-button-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e9c4878240e7d95572902aec53a2cce51fa94f1
GIT binary patch
literal 1536
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUVq>kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0
zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij}3MtFxuC
zqq(t*k%5_op`nF=g|VZVlc9;ZfrXKap)<@3Y<gXtOr6b5j9p9}4a^J;U5zX(jLe-a
zoy=TaEgelQ49sDAJ@bl767!N%VfJPM?S<-f#;e!LxhOTUB)=#mKR*YS0s=DfOY(~|
z@(UE4gUu8)d=ry1^FRWcpa_Ea*Cn+mvn(~mttdZN0UW|snOIz4=}gGy5WOkngql9k
zG5Vn7fs|ZeLclZ#V!{(YkOR*?sd>OWQv}Q$%%1CxF)%RcdAc};RNTr5_RW?G6sa}t
zyWb@>mE)*RiQ>|Op#p`I9X4^jUH?MuCwt?cM!n6&Q{yjQ3RPTEqNt~pq^f<CMTzbB
zf)&B`$LD;WG12ox^W&KJd!OI?eXiPHuy5<loGE3y=Vok;694@3Ps+xKH<#aktoT>C
z_g?(XoNv);lP`+8-n=1m)bX0u)Kkw7CIrN-4bz-{T6IFk@gr4x#bz!0`sm}2%8e0!
z8gFDpGjP7k+WKqj_19A;9&z~?$0#z*V`<RyR;PzjAD156SQ>ktG2Cu`|6{K`;SAA}
z67)W>|6A5ovEcH{m|b`C*57|Gt`np+)x~bUc%y?ulUZ$#Vf)S}6IMS|XFSOFR$=$q
zG~-NX153u-UlyX<kGt~ioTJe9v25X{4S}n#9x1W9>*p}rE}c(G^}yXkOZ#23Z*1?n
z*s^NX?Y-9F8X}WiE}JZsyV4hPl}k#dKSgQ!>COZL4Y$P;S#p29u_!+LaD$^Bw*=7h
z_ulP^(R-@tqb3}<{<><$<>L~?GrakB{NLI7JjLi|v4u?CCN8cR4NbL4Pk!{eISVOI
z?D*5qq-ObKQv+XW{^gfn3b)_3U2y7RMu<?((VKHwEv@#S`0LHLvrF|D`vdO2S8MLS
zf1e!kb?pQdr<Afhr!Ph^_ZyGD4Lz35Z_!k1CD+f-d$@y1?^xlK>;#U7b&Cz$_cO{>
zOpUiyi{ojC5^3l^uuim&>0N`?1r|1y{Z+l+il5#5R1|r%DJ<jE-$@=%=br!R+Q7*0
XS(rcL%-V}nKxMM0tDnm{r-UW|M94of

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index a88a1de84..0cf01b303 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -2704,6 +2704,7 @@ var themedButtonValues = nil,
             }),
 
         closeButtonImage =                  PatternImage(@"window-standard-close-button.png", 16, 16),
+        closeButtonImageInactive =          PatternImage(@"window-standard-close-button-inactive.png", 16, 16),
         closeButtonImageHighlighted =       PatternImage(@"window-standard-button-highlighted.png",16, 16),
         unsavedButtonImage =                PatternImage(@"window-standard-button-unsaved.png",16, 16),
         unsavedButtonImageHighlighted =     PatternImage(@"window-standard-close-button-unsaved-highlighted.png",16, 16),
@@ -2736,6 +2737,7 @@ var themedButtonValues = nil,
 
             [@"unsaved-image-button"                ,unsavedButtonImage],
             [@"unsaved-image-highlighted-button"    ,unsavedButtonImageHighlighted],
+            [@"close-image-button",                 closeButtonImageInactive, CPThemeStateNormal],
             [@"close-image-button"                  ,closeButtonImage],
             [@"close-image-highlighted-button"      ,closeButtonImageHighlighted],
             [@"minimize-image-button"               ,minimizeButtonImage],

From 758a0232672c925899407db9675b7ff6b7df05ad Mon Sep 17 00:00:00 2001
From: daboe01 <daboe01@googlemail.com>
Date: Sun, 31 Aug 2014 21:21:42 +0200
Subject: [PATCH 2/2] style

---
 AppKit/Themes/Aristo/ThemeDescriptors.j | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 0cf01b303..43426f04e 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -2737,8 +2737,9 @@ var themedButtonValues = nil,
 
             [@"unsaved-image-button"                ,unsavedButtonImage],
             [@"unsaved-image-highlighted-button"    ,unsavedButtonImageHighlighted],
-            [@"close-image-button",                 closeButtonImageInactive, CPThemeStateNormal],
-            [@"close-image-button"                  ,closeButtonImage],
+            [@"close-image-button"                  ,closeButtonImageInactive, CPThemeStateNormal],
+            [@"close-image-button"                  ,closeButtonImage, CPThemeStateKeyWindow],
+            [@"close-image-button"                  ,closeButtonImage, CPThemeStateMainWindow],
             [@"close-image-highlighted-button"      ,closeButtonImageHighlighted],
             [@"minimize-image-button"               ,minimizeButtonImage],
             [@"minimize-image-highlighted-button"   ,minimizeButtonImageHighlighted],