mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 20:01:11 +00:00
whatever.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16459 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
e9ccc289d5
commit
42689ac827
4 changed files with 10 additions and 29 deletions
|
@ -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>
|
||||
|
||||
Multiple outstanding commits.
|
||||
|
|
|
@ -44,8 +44,8 @@ typedef enum {
|
|||
* GNUstep specific. Blame: Michael Hanni.
|
||||
*/
|
||||
|
||||
GSWindowMakerInterfaceStyle = 4,
|
||||
GSGtkInterfaceStyle = 5
|
||||
GSWindowMakerInterfaceStyle = 4
|
||||
|
||||
} NSInterfaceStyle;
|
||||
|
||||
APPKIT_EXPORT NSString *NSInterfaceStyleDefault;
|
||||
|
|
|
@ -48,8 +48,6 @@ styleFromString(NSString* str)
|
|||
return NSMacintoshInterfaceStyle;
|
||||
if ([str isEqualToString: @"NSWindows95InterfaceStyle"])
|
||||
return NSWindows95InterfaceStyle;
|
||||
if ([str isEqualToString: @"GSGtkInterfaceStyle"])
|
||||
return GSGtkInterfaceStyle;
|
||||
if ([str isEqualToString: @"GSWindowMakerInterfaceStyle"])
|
||||
return GSWindowMakerInterfaceStyle;
|
||||
return NSNoInterfaceStyle;
|
||||
|
|
|
@ -258,31 +258,8 @@ NSImage *images[maxCount];
|
|||
r = NSIntersectionRect(r,rect);
|
||||
if (!NSIsEmptyRect(r))
|
||||
{
|
||||
if (NSInterfaceStyleForKey(@"NSProgressIndicatorInterfaceStyle", nil)
|
||||
== GSGtkInterfaceStyle)
|
||||
{
|
||||
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);
|
||||
}
|
||||
[fillColour set];
|
||||
NSRectFill(r);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue