* Source/GSThemeDrawing.m (-drawColorWellBorder:...): Draw inner

border using part GSColorWellInnerBorder
	* Source/GSTheme.m:
	* Headers/Additions/GNUstepGUI/GSTheme.h: Add GSColorWellInnerBorder
	part name


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37240 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2013-10-16 04:11:41 +00:00
parent a4fa237d9e
commit c05595c8be
4 changed files with 27 additions and 5 deletions

View file

@ -1,3 +1,11 @@
2013-10-15 Eric Wasylishen <ewasylishen@gmail.com>
* Source/GSThemeDrawing.m (-drawColorWellBorder:...): Draw inner
border using part GSColorWellInnerBorder
* Source/GSTheme.m:
* Headers/Additions/GNUstepGUI/GSTheme.h: Add GSColorWellInnerBorder
part name
2013-10-15 Eric Wasylishen <ewasylishen@gmail.com>
* Source/GSThemePrivate.h:

View file

@ -301,6 +301,7 @@ APPKIT_EXPORT NSString *GSProgressIndicatorBarDeterminate;
* Color well part names.
*/
APPKIT_EXPORT NSString *GSColorWell;
APPKIT_EXPORT NSString *GSColorWellInnerBorder;
/* NSSliderCell parts */
APPKIT_EXPORT NSString *GSSliderHorizontalTrack;

View file

@ -102,6 +102,7 @@ NSString *GSProgressIndicatorBarDeterminate
// Color well part names
NSString *GSColorWell = @"GSColorWell";
NSString *GSColorWellInnerBorder = @"GSColorWellInnerBorder";
// Slider part names
NSString *GSSliderHorizontalTrack = @"GSSliderHorizontalTrack";

View file

@ -1209,11 +1209,23 @@
*/
if ([well isEnabled])
{
/*
* Draw inner frame.
*/
[self drawGrayBezel: aRect withClip: clipRect];
aRect = NSInsetRect(aRect, 2.0, 2.0);
GSDrawTiles *tiles = [self tilesNamed: GSColorWellInnerBorder state: GSThemeNormalState];
if (tiles == nil)
{
/*
* Draw inner frame.
*/
[self drawGrayBezel: aRect withClip: clipRect];
aRect = NSInsetRect(aRect, 2.0, 2.0);
}
else
{
[self fillRect: aRect
withTiles: tiles
background: [NSColor clearColor]];
aRect = [tiles contentRectForRect: aRect isFlipped: [well isFlipped]];
}
}
return aRect;