From 8df8479716c55dafeb4cc8b3af7a842caa10b4e6 Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Wed, 9 Jan 2013 18:53:23 -0800 Subject: [PATCH] Updated Aristo2 --- .../Resources/toolbar-background-bottom.png | Bin 0 -> 991 bytes .../Resources/toolbar-background-center.png | Bin 0 -> 1011 bytes .../Resources/toolbar-background-top.png | Bin 0 -> 991 bytes AppKit/Themes/Aristo2/ThemeDescriptors.j | 33 ++++++++++++++---- 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 AppKit/Themes/Aristo2/Resources/toolbar-background-bottom.png create mode 100644 AppKit/Themes/Aristo2/Resources/toolbar-background-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/toolbar-background-top.png diff --git a/AppKit/Themes/Aristo2/Resources/toolbar-background-bottom.png b/AppKit/Themes/Aristo2/Resources/toolbar-background-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..ed3e9bd84b6d60091ebf665921b2f0a767195a8d GIT binary patch literal 991 zcmbVL&u-H&7|+Herb*MzaI&&1P3*LBlW5sUlZI6yV`?i=#058T*Jw+eIUdb+Lfp9V z9!Q+Hao`M(z<~oVz$@T%%>ZfIfhdXn+28N?{eO3S^kjSM;g+H(+k?YkDA%?6+gz9b z_lwaFxjYd4i5Rh&SP)JXFJV&(1{pb_LrRj%^RIMIQSQys@kC6br%uc=jnq0?l@$`L zD0>H0LE=*?z?7b(xvT#A{6z(6;;PTh2u6iZ=jq`Ur=zQ*aeQ?e+lhLx5B4fY5@b{m zP-SO%=~S+| zLqN-zr-eva4r)d+Wf#I#rKi^+WJMI+5a;D8Q8HzEMG75hP|vbDuBCP5cP@r?M#IEMW0PMsqO;Tvgs^Nt!qiSu%^=4(u8b zTL{?*+CdQF(DTAJ4vdE5Hmue2`t5FLb^3;fP~Wf+?)ey+USPIu?Drb%ATI^UW7^nF zrQH>_dneZMIVFPeF=J;<2OQ6tVC9?@z#o|)B5|76a$TP5XamaA*E9(^%fK?fPI`-d zX#X3x)kUG*ff!@h3$3=VuCU4fpIYZXHy*!PQ#L-WzxeR2w^@(epnnv6?7e#X8?tCCH~;_u literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/toolbar-background-center.png b/AppKit/Themes/Aristo2/Resources/toolbar-background-center.png new file mode 100644 index 0000000000000000000000000000000000000000..e459f1aedda88a69644d5ef4078d959520ca6943 GIT binary patch literal 1011 zcmbVLJ#W)M7&e3fRdhgI3IjSh69|8tKQ6HqQ#p1_BjL76Bglks>`P)=`;2`hZbv3q z`5`P!hygJ&qDly{@e9~k7|J<~3rJN5EZcYQ-TOT6_p6<)`>QKAS2&Ja?QgmRwq9bN zarH9$myf^PV#^KM8_``dq4OZeoE?!d2K^+M;sFk#!)KpxhvOQPcsQaX|A85jL<}k& zu}m_C=D5yAnFZk4;~wag zCL>5N4M3Ufr-fNs{DRkH`|4QY!9s=ZS^TL}BYy`tB*#D(RUwoi1PF;x(-DGqfg(di zlG%#{sF^x4l@?e&JhPTZ6La8tOIu8`_!*^{DM|DBT%4;S$)^%D45Q*u6oF|7#bHW= zQb>zt&EVo9%;Sv4Bn1^?FeV4o;+dzXAtagapAo0UGEppLQW<0t6lEz%s<;-~1s&i& zZk(%K3=cCb4RApY@{rYI(yYNOcNZI~6qz^Xb{?~$1p6)t4-%ZxzH9O9MvUUflwq4? zv8Bl^MMiB14JaF~>mkp!Jr%i1&2b*K-L-pa%hR-;Vnf(d+7NXeB+Mb9-P7!4Cf&LI`TOm+ P)fo1BTkf0glNY}MNq9A{ literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/toolbar-background-top.png b/AppKit/Themes/Aristo2/Resources/toolbar-background-top.png new file mode 100644 index 0000000000000000000000000000000000000000..ed3e9bd84b6d60091ebf665921b2f0a767195a8d GIT binary patch literal 991 zcmbVL&u-H&7|+Herb*MzaI&&1P3*LBlW5sUlZI6yV`?i=#058T*Jw+eIUdb+Lfp9V z9!Q+Hao`M(z<~oVz$@T%%>ZfIfhdXn+28N?{eO3S^kjSM;g+H(+k?YkDA%?6+gz9b z_lwaFxjYd4i5Rh&SP)JXFJV&(1{pb_LrRj%^RIMIQSQys@kC6br%uc=jnq0?l@$`L zD0>H0LE=*?z?7b(xvT#A{6z(6;;PTh2u6iZ=jq`Ur=zQ*aeQ?e+lhLx5B4fY5@b{m zP-SO%=~S+| zLqN-zr-eva4r)d+Wf#I#rKi^+WJMI+5a;D8Q8HzEMG75hP|vbDuBCP5cP@r?M#IEMW0PMsqO;Tvgs^Nt!qiSu%^=4(u8b zTL{?*+CdQF(DTAJ4vdE5Hmue2`t5FLb^3;fP~Wf+?)ey+USPIu?Drb%ATI^UW7^nF zrQH>_dneZMIVFPeF=J;<2OQ6tVC9?@z#o|)B5|76a$TP5XamaA*E9(^%fK?fPI`-d zX#X3x)kUG*ff!@h3$3=VuCU4fpIYZXHy*!PQ#L-WzxeR2w^@(epnnv6?7e#X8?tCCH~;_u literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 5ad62b391..119e08ec8 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -1957,11 +1957,11 @@ var themedButtonValues = nil, ]), closeButtonImage = PatternImage(@"window-standard-close-button.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), - minimizeButtonImage = PatternImage(@"window-standard-minimize-button",16,16), - minimizeButtonImageHighlighted = PatternImage(@"window-standard-minimize-button-highlighted",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), + minimizeButtonImage = PatternImage(@"window-standard-minimize-button.png",16, 16), + minimizeButtonImageHighlighted = PatternImage(@"window-standard-minimize-button-highlighted.png",16, 16), sheetShadow = PatternColor(@"window-attached-sheet-shadow.png", 9, 8), resizeIndicator = PatternImage(@"window-resize-indicator.png", 12, 12), @@ -2036,11 +2036,32 @@ var themedButtonValues = nil, return docModalWindowView; } ++(_CPBorderlessBridgeWindowView)themedBordelessBridgeWindowView +{ + var bordelessBridgeWindowView = [[_CPBorderlessBridgeWindowView alloc] initWithFrame:CGRectMake(0,0,0,0)], + + toolbarBackgroundColor = PatternColor( + [ + [@"toolbar-background-top.png", 1.0, 1.0], + [@"toolbar-background-center.png", 1.0, 57.0], + [@"toolbar-background-bottom.png", 1.0, 1.0] + ], PatternIsVertical) + + themeValues = + [ + [@"toolbar-background-color", toolbarBackgroundColor] + ]; + + [self registerThemeValues:themeValues forView:bordelessBridgeWindowView inherit:themedWindowViewValues]; + + return bordelessBridgeWindowView; +} + +(_CPToolbarView)themedToolbarView { var toolbarView = [[_CPToolbarView alloc] initWithFrame:CGRectMakeZero()], - toolbarExtraItemsImage = PatternImage(@"toolbar-view-extra-items-image", 10, 15), + toolbarExtraItemsImage = PatternImage(@"toolbar-view-extra-items-image.png", 10, 15), toolbarExtraItemsAlternateImage = PatternImage(@"toolbar-view-extra-items-alternate-image.png", 10, 15), themeValues =