From 5501a5a4b769c807c2362649cf3ed27e6ed1ec7f Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Mon, 14 Oct 2013 03:31:54 +0000 Subject: [PATCH] * Headers/Additions/GNUstepGUI/GSTheme.h: * Source/GSTheme.m: Add GSProgressIndicatorBezel part name * Source/GSThemeDrawing.m (-drawProgressIndicatorBezel:withClip:): Use GSProgressIndicatorBezel to draw bezel if available. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37222 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ Headers/Additions/GNUstepGUI/GSTheme.h | 1 + Source/GSTheme.m | 1 + Source/GSThemeDrawing.m | 16 +++++++++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f51bdde26..23373a88f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-10-13 Eric Wasylishen + + * Headers/Additions/GNUstepGUI/GSTheme.h: + * Source/GSTheme.m: Add GSProgressIndicatorBezel part name + * Source/GSThemeDrawing.m (-drawProgressIndicatorBezel:withClip:): + Use GSProgressIndicatorBezel to draw bezel if available. + 2013-10-12 Eric Wasylishen * Source/GSThemeTools.m (-initWithNinePatchImage:): Parse the diff --git a/Headers/Additions/GNUstepGUI/GSTheme.h b/Headers/Additions/GNUstepGUI/GSTheme.h index 54f98b4f3..601add467 100644 --- a/Headers/Additions/GNUstepGUI/GSTheme.h +++ b/Headers/Additions/GNUstepGUI/GSTheme.h @@ -297,6 +297,7 @@ APPKIT_EXPORT NSString *GSPopUpButton; /* * Progress Indicator part names. */ +APPKIT_EXPORT NSString *GSProgressIndicatorBezel; APPKIT_EXPORT NSString *GSProgressIndicatorBarDeterminate; /* diff --git a/Source/GSTheme.m b/Source/GSTheme.m index c8e4f63c9..4f5c89af4 100644 --- a/Source/GSTheme.m +++ b/Source/GSTheme.m @@ -99,6 +99,7 @@ NSString *GSMenuSeparatorItem = @"GSMenuSeparatorItem"; NSString *GSPopUpButton = @"GSPopUpButton"; // Progress indicator part names +NSString *GSProgressIndicatorBezel = @"GSProgressIndicatorBezel"; NSString *GSProgressIndicatorBarDeterminate = @"GSProgressIndicatorBarDeterminate"; diff --git a/Source/GSThemeDrawing.m b/Source/GSThemeDrawing.m index 0c3ebe9d7..687b5810a 100644 --- a/Source/GSThemeDrawing.m +++ b/Source/GSThemeDrawing.m @@ -1400,7 +1400,21 @@ static NSImage *spinningImages[MaxCount]; - (NSRect) drawProgressIndicatorBezel: (NSRect)bounds withClip: (NSRect) rect { - return [self drawGrayBezel: bounds withClip: rect]; + GSDrawTiles *tiles = [self tilesNamed: GSProgressIndicatorBezel + state: GSThemeNormalState]; + + if (tiles == nil) + { + return [self drawGrayBezel: bounds withClip: rect]; + } + else + { + [self fillRect: bounds + withTiles: tiles + background: [NSColor clearColor]]; + + return [tiles contentRectForRect: bounds]; + } } - (void) drawProgressIndicatorBarDeterminate: (NSRect)bounds