gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 20:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

whatever.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16459 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
michael 2003-04-14 00:03:09 +00:00
parent 8df511620b
commit d1a83dfe4c
4 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-04-13 Michael Hanni <michael@deviant-behavior.com>
* Source/NSProgressIndicator.m: revert last change.
* Source/NSInterfaceStyle.m: revert last change.
* Headers/NSInterfaceStyle.h: revert last change.
2003-04-13 Michael Hanni <michael@deviant-behavior.com> 2003-04-13 Michael Hanni <michael@deviant-behavior.com>
Multiple outstanding commits. Multiple outstanding commits.

4
Headers/gnustep/gui/NSInterfaceStyle.h
View file

@ -44,8 +44,8 @@ typedef enum {
* GNUstep specific. Blame: Michael Hanni. * GNUstep specific. Blame: Michael Hanni.
*/ */
GSWindowMakerInterfaceStyle = 4, GSWindowMakerInterfaceStyle = 4
GSGtkInterfaceStyle = 5
} NSInterfaceStyle; } NSInterfaceStyle;
APPKIT_EXPORT NSString *NSInterfaceStyleDefault; APPKIT_EXPORT NSString *NSInterfaceStyleDefault;

2
Source/NSInterfaceStyle.m
View file

@ -48,8 +48,6 @@ styleFromString(NSString* str)
return NSMacintoshInterfaceStyle; return NSMacintoshInterfaceStyle;
if ([str isEqualToString: @"NSWindows95InterfaceStyle"]) if ([str isEqualToString: @"NSWindows95InterfaceStyle"])
return NSWindows95InterfaceStyle; return NSWindows95InterfaceStyle;
if ([str isEqualToString: @"GSGtkInterfaceStyle"])
return GSGtkInterfaceStyle;
if ([str isEqualToString: @"GSWindowMakerInterfaceStyle"]) if ([str isEqualToString: @"GSWindowMakerInterfaceStyle"])
return GSWindowMakerInterfaceStyle; return GSWindowMakerInterfaceStyle;
return NSNoInterfaceStyle; return NSNoInterfaceStyle;

27
Source/NSProgressIndicator.m
View file

@ -258,31 +258,8 @@ NSImage *images[maxCount];
r = NSIntersectionRect(r,rect); r = NSIntersectionRect(r,rect);
if (!NSIsEmptyRect(r)) if (!NSIsEmptyRect(r))
{ {
if (NSInterfaceStyleForKey(@"NSProgressIndicatorInterfaceStyle", nil) [fillColour set];
== GSGtkInterfaceStyle) NSRectFill(r);
{
NSRectEdge sides[] = {NSMaxXEdge, NSMinYEdge,
NSMinXEdge, NSMaxYEdge,
NSMaxXEdge, NSMinYEdge};
float grays[] = {NSBlack, NSBlack,
NSLightGray, NSLightGray,
NSDarkGray, NSDarkGray};
NSRect rect;
rect = NSDrawTiledRects(r, r,
sides, grays, 6);
/* This should perhaps be something else to ease in
* color themeing.
*/
[[NSColor scrollBarColor] set];
NSRectFill(rect);
}
else /* default case */
{
[fillColour set];
NSRectFill(r);
}
} }
} }
} }