mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 08:30:59 +00:00
* Source/GSThemeDrawing.m:
* Source/GSTheme.m: * Headers/Additions/GNUstepGUI/GSTheme.h: Add part names for themeing bottom tabs. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37211 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
3d3125cdde
commit
3e533f43b1
4 changed files with 71 additions and 19 deletions
|
@ -1,3 +1,10 @@
|
|||
2013-10-08 Eric Wasylishen <ewasylishen@gmail.com>
|
||||
|
||||
* Source/GSThemeDrawing.m:
|
||||
* Source/GSTheme.m:
|
||||
* Headers/Additions/GNUstepGUI/GSTheme.h: Add part names for
|
||||
themeing bottom tabs.
|
||||
|
||||
2013-10-08 Eric Wasylishen <ewasylishen@gmail.com>
|
||||
|
||||
* Source/GSThemeDrawing.m (-drawBoxInClipRect:...):
|
||||
|
|
|
@ -315,6 +315,15 @@ APPKIT_EXPORT NSString *GSBoxBorder;
|
|||
APPKIT_EXPORT NSString *GSTabViewSelectedTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewUnSelectedTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewBackgroundTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewBottomSelectedTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewBottomUnSelectedTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewBottomBackgroundTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewLeftSelectedTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewLeftUnSelectedTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewLeftBackgroundTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewRightSelectedTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewRightUnSelectedTabFill;
|
||||
APPKIT_EXPORT NSString *GSTabViewRightBackgroundTabFill;
|
||||
|
||||
/**
|
||||
* Structure to describe the size of top/bottom/left/right margins inside
|
||||
|
|
|
@ -116,6 +116,16 @@ NSString *GSBoxBorder = @"GSBoxBorder";
|
|||
NSString *GSTabViewSelectedTabFill = @"GSTabViewSelectedTabFill";
|
||||
NSString *GSTabViewUnSelectedTabFill = @"GSTabViewUnSelectedTabFill";
|
||||
NSString *GSTabViewBackgroundTabFill = @"GSTabViewBackgroundTabFill";
|
||||
NSString *GSTabViewBottomSelectedTabFill = @"GSTabViewBottomSelectedTabFill";
|
||||
NSString *GSTabViewBottomUnSelectedTabFill = @"GSTabViewBottomUnSelectedTabFill";
|
||||
NSString *GSTabViewBottomBackgroundTabFill = @"GSTabViewBottomBackgroundTabFill";
|
||||
NSString *GSTabViewLeftSelectedTabFill = @"GSTabViewLeftSelectedTabFill";
|
||||
NSString *GSTabViewLeftUnSelectedTabFill = @"GSTabViewLeftUnSelectedTabFill";
|
||||
NSString *GSTabViewLeftBackgroundTabFill = @"GSTabViewLeftBackgroundTabFill";
|
||||
NSString *GSTabViewRightSelectedTabFill = @"GSTabViewRightSelectedTabFill";
|
||||
NSString *GSTabViewRightUnSelectedTabFill = @"GSTabViewRightUnSelectedTabFill";
|
||||
NSString *GSTabViewRightBackgroundTabFill = @"GSTabViewRightBackgroundTabFill";
|
||||
|
||||
|
||||
NSString *GSThemeDidActivateNotification
|
||||
= @"GSThemeDidActivateNotification";
|
||||
|
|
|
@ -1925,6 +1925,50 @@ typedef enum {
|
|||
return [NSImage imageNamed: imageName];
|
||||
}
|
||||
|
||||
- (GSDrawTiles *)tilesForTabPart: (GSTabPart)part type: (NSTabViewType)type
|
||||
{
|
||||
NSString *name = nil;
|
||||
|
||||
if (type == NSTopTabsBezelBorder)
|
||||
{
|
||||
if (part == GSTabSelectedFill)
|
||||
name = GSTabViewSelectedTabFill;
|
||||
else if (part == GSTabUnSelectedFill)
|
||||
name = GSTabViewUnSelectedTabFill;
|
||||
else if (part == GSTabBackgroundFill)
|
||||
name = GSTabViewBackgroundTabFill;
|
||||
}
|
||||
else if (type == NSBottomTabsBezelBorder)
|
||||
{
|
||||
if (part == GSTabSelectedFill)
|
||||
name = GSTabViewBottomSelectedTabFill;
|
||||
else if (part == GSTabUnSelectedFill)
|
||||
name = GSTabViewBottomUnSelectedTabFill;
|
||||
else if (part == GSTabBackgroundFill)
|
||||
name = GSTabViewBottomBackgroundTabFill;
|
||||
}
|
||||
else if (type == NSLeftTabsBezelBorder)
|
||||
{
|
||||
if (part == GSTabSelectedFill)
|
||||
name = GSTabViewLeftSelectedTabFill;
|
||||
else if (part == GSTabUnSelectedFill)
|
||||
name = GSTabViewLeftUnSelectedTabFill;
|
||||
else if (part == GSTabBackgroundFill)
|
||||
name = GSTabViewLeftBackgroundTabFill;
|
||||
}
|
||||
else if (type == NSRightTabsBezelBorder)
|
||||
{
|
||||
if (part == GSTabSelectedFill)
|
||||
name = GSTabViewRightSelectedTabFill;
|
||||
else if (part == GSTabUnSelectedFill)
|
||||
name = GSTabViewRightUnSelectedTabFill;
|
||||
else if (part == GSTabBackgroundFill)
|
||||
name = GSTabViewRightBackgroundTabFill;
|
||||
}
|
||||
|
||||
return [self tilesNamed: name state: GSThemeNormalState];
|
||||
}
|
||||
|
||||
- (void) frameTabRectTopAndBottom: (NSRect)aRect
|
||||
topColor: (NSColor *)topColor
|
||||
bottomColor: (NSColor *)bottomColor
|
||||
|
@ -1945,25 +1989,7 @@ typedef enum {
|
|||
|
||||
- (void) drawTabFillInRect: (NSRect)aRect forPart: (GSTabPart)part type: (NSTabViewType)type
|
||||
{
|
||||
NSString *name = nil;
|
||||
GSDrawTiles *tiles = nil;
|
||||
|
||||
switch (part)
|
||||
{
|
||||
case GSTabSelectedFill:
|
||||
name = GSTabViewSelectedTabFill;
|
||||
break;
|
||||
case GSTabUnSelectedFill:
|
||||
name = GSTabViewUnSelectedTabFill;
|
||||
break;
|
||||
case GSTabBackgroundFill:
|
||||
name = GSTabViewBackgroundTabFill;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
tiles = [self tilesNamed: name state: GSThemeNormalState];
|
||||
GSDrawTiles *tiles = [self tilesForTabPart: part type: type];
|
||||
|
||||
if (tiles == nil)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue