From 5ccc638bafbf22ca44d237e7965979c6f67c57f2 Mon Sep 17 00:00:00 2001 From: Ross Boucher Date: Mon, 27 Jul 2009 15:55:53 -0700 Subject: [PATCH] Add resources for CPButton disabled state. Closes #152. --- .gitignore | 2 +- .../Resources/button-bezel-disabled-center.png | Bin 0 -> 148 bytes .../Resources/button-bezel-disabled-left.png | Bin 0 -> 221 bytes .../Resources/button-bezel-disabled-right.png | Bin 0 -> 217 bytes AppKit/Themes/Aristo/ThemeDescriptors.j | 12 ++++++++++++ 5 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-disabled-center.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-disabled-left.png create mode 100644 AppKit/Themes/Aristo/Resources/button-bezel-disabled-right.png diff --git a/.gitignore b/.gitignore index 71e257752..b72055ed9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ Frameworks Build Demos -Aristo +./Aristo WebSite diff --git a/AppKit/Themes/Aristo/Resources/button-bezel-disabled-center.png b/AppKit/Themes/Aristo/Resources/button-bezel-disabled-center.png new file mode 100644 index 0000000000000000000000000000000000000000..7f143a3de420f9d7c4e33a1f9560c7bf8b328130 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!3HF)&rH7sq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c6`6UuIEGZ*O1ihZJfHdS_xJauXY8x}eeA%O_xJ7Dmi_<# v-#Iel$o>8G9}5b*7D`q|6H_V+Po~-c71evXIEGZ*O1iVVT;G_Px!G1gn!!;1^#A|=WtT2llCxy# zQpp=PZb-~%U}}5x=n+r-|9`1JzP*)ZKE1#G|Bl8PjBE~35)Kl243k^~9hWhj@Vb?~ zuv78`(*lJ*zkYwuXNzz!WK2D8U;l5;!|Utg6Q(Xuxby$l*X%TfYpkyxFmf0$Bzopr0C0a->Hq)$ literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/button-bezel-disabled-right.png b/AppKit/Themes/Aristo/Resources/button-bezel-disabled-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6db8a99ddb64e24a16fa26f4cb11baa95eebc71d GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c6;*q>IEGZ*O1iVVJfE4F`LMdeK87Rgk!#khk*NFo>*)6{ zFN1fdpPy%FSo`~1@5A@^_wzh@^oZyG|NrJGKfk}1XXatJc}K?~a0f$2@46-(#tBom zTz3*SHeg9${PO&~d;mi&>uQF=xP3L8L4}P^53vTkFs@;IblPDLzrq2AIN5nCV#>O5 QfX-m>boFyt=akR{0OL$m1ONa4 literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index 72efe57a9..7eeefa96d 100644 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -53,6 +53,14 @@ [_CPCibCustomResource imageResourceWithName:"default-button-bezel-highlighted-center.png" size:CGSizeMake(1.0, 24.0)], [_CPCibCustomResource imageResourceWithName:"default-button-bezel-highlighted-right.png" size:CGSizeMake(4.0, 24.0)] ] + isVertical:NO]], + + disabledBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices: + [ + [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)], + [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)], + [_CPCibCustomResource imageResourceWithName:"button-bezel-disabled-right.png" size:CGSizeMake(4.0, 24.0)] + ] isVertical:NO]]; [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered]; @@ -65,6 +73,10 @@ [button setValue:highlightedBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateHighlighted]; [button setValue:CGInsetMake(0.0, 5.0, 0.0, 5.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered]; + [button setValue:[CPColor colorWithCalibratedWhite:0.6 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled]; + [button setValue:disabledBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled]; + [button setValue:disabledBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDefault|CPThemeStateDisabled]; + [button setValue:defaultBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDefault]; [button setValue:defaultHighlightedBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateHighlighted|CPThemeStateDefault]; [button setValue:[CPColor colorWithCalibratedRed:13.0/255.0 green:51.0/255.0 blue:70.0/255.0 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDefault];