From dcc031f23a07ae54065785cd78f3364a08fe9d18 Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Tue, 13 Mar 2012 14:01:58 +0000 Subject: [PATCH] Fixed: small size toolbars in bridge windows didn't show the bottom shadow line. Switched to using a somewhat vertically resizable three part image. The centre image part is being compressed which normally would look poor but you can't tell since it's a gradient. --- AppKit/CPWindow/_CPBorderlessBridgeWindowView.j | 9 ++++++++- .../_CPToolbarView/_CPToolbarViewBackground.png | Bin 185 -> 0 bytes .../_CPToolbarView/toolbar-background-bottom.png | Bin 0 -> 108 bytes .../_CPToolbarView/toolbar-background-center.png | Bin 0 -> 193 bytes .../_CPToolbarView/toolbar-background-top.png | Bin 0 -> 109 bytes 5 files changed, 8 insertions(+), 1 deletion(-) delete mode 100644 AppKit/Resources/_CPToolbarView/_CPToolbarViewBackground.png create mode 100644 AppKit/Resources/_CPToolbarView/toolbar-background-bottom.png create mode 100644 AppKit/Resources/_CPToolbarView/toolbar-background-center.png create mode 100644 AppKit/Resources/_CPToolbarView/toolbar-background-top.png diff --git a/AppKit/CPWindow/_CPBorderlessBridgeWindowView.j b/AppKit/CPWindow/_CPBorderlessBridgeWindowView.j index 26293bf4b..24faf9ba8 100644 --- a/AppKit/CPWindow/_CPBorderlessBridgeWindowView.j +++ b/AppKit/CPWindow/_CPBorderlessBridgeWindowView.j @@ -33,7 +33,14 @@ var _CPToolbarViewBackgroundColor = nil; + (CPColor)toolbarBackgroundColor { if (!_CPToolbarViewBackgroundColor) - _CPToolbarViewBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPBorderlessBridgeWindowView class]] pathForResource:@"_CPToolbarView/_CPToolbarViewBackground.png"] size:CGSizeMake(1.0, 59.0)]]; + { + var bundle = [CPBundle bundleForClass:[_CPBorderlessBridgeWindowView class]]; + _CPToolbarViewBackgroundColor = CPColorWithImages([ + ["_CPToolbarView/toolbar-background-top.png", 1, 1, bundle], + ["_CPToolbarView/toolbar-background-center.png", 1, 57.0, bundle], + ["_CPToolbarView/toolbar-background-bottom.png", 1, 1, bundle], + ], CPColorPatternIsVertical); + } return _CPToolbarViewBackgroundColor; } diff --git a/AppKit/Resources/_CPToolbarView/_CPToolbarViewBackground.png b/AppKit/Resources/_CPToolbarView/_CPToolbarViewBackground.png deleted file mode 100644 index 25cfcc4840a24bec34fc0e4c6146c686463624a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^j6iJ7!2~2trDSr z1<%~X^wgl##FWaylc_d9MbVxvjv*YftOpqx4><6&81VfMio4n}MYZm}y5eCkhf@v* zwAtB;)Mrnfm|XU}ky(-Z{Up^y)kNo0uVprGnzUh3YNG04Jw|P1PR{-%ENfa?DyQ>l gGcz(ObKbAEKVuYeVJ274VxTn)p00i_>zopr0F{$D$N&HU diff --git a/AppKit/Resources/_CPToolbarView/toolbar-background-bottom.png b/AppKit/Resources/_CPToolbarView/toolbar-background-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..4dcfb044e39f33aa82df0c3b1d32536470388335 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2ryk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X_&i-4Ln>}1Y3b>)aTqW#?PH9Yxbl%2P=>+N)z4*}Q$iB} DFm)TU literal 0 HcmV?d00001 diff --git a/AppKit/Resources/_CPToolbarView/toolbar-background-center.png b/AppKit/Resources/_CPToolbarView/toolbar-background-center.png new file mode 100644 index 0000000000000000000000000000000000000000..18e0335f48144f866be2f77e94443efe944382aa GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^j6iJ3!2~2L;;zX7DajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MaiBnjv*DdeEcp7HUw}ueUIN{&cPBDE-$yD;oDBX#TO}1RegCO=+MB(z#74{Qgy}64?rmfPgg&ebxsLQ E0EFirRsaA1 literal 0 HcmV?d00001