gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 16:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSTabView.m: Uncomment - (BOOL) isFlipped { return YES; }

Browse source 
* Source/GSThemeDrawing.m: Change tab drawing to assume flipped
coordinates


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37206 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2013-10-08 17:35:44 +00:00
parent 7d7cac6780
commit 0786f621f2
3 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-10-08 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSTabView.m: Uncomment - (BOOL) isFlipped { return YES; }
* Source/GSThemeDrawing.m: Change tab drawing to assume flipped
coordinates
2013-10-08 Eric Wasylishen <ewasylishen@gmail.com>
* Source/GSThemeDrawing.m: Rewrite tab drawing code to be more

46
Source/GSThemeDrawing.m
View file

@ -1932,9 +1932,9 @@ typedef enum {
NSRect bottom = aRect;
NSRect top = aRect;
bottom.size.height = 1;
top.origin.y = NSMaxY(aRect) - 1;
top.size.height = 1;
bottom.origin.y = NSMaxY(aRect) - 1;
bottom.size.height = 1;
[topColor set];
NSRectFill(top);
@ -1983,9 +1983,9 @@ typedef enum {
break;
case GSTabBackgroundFill:
{
NSRect clip = aRect;
const NSRect clip = aRect;
aRect.origin.x -= 2;
aRect.origin.y = NSMaxY(aRect) - 2;
aRect.origin.y = NSMinY(aRect) - 2;
aRect.size.width += 2;
aRect.size.height = 4;
[self drawButton: aRect withClip: clip];
@ -2011,9 +2011,9 @@ typedef enum {
break;
case GSTabBackgroundFill:
{
NSRect clip = aRect;
const NSRect clip = aRect;
aRect.origin.x -= 2;
aRect.origin.y -= 3;
aRect.origin.y = NSMaxY(aRect) - 1;
aRect.size.width += 2;
aRect.size.height = 4;
[self drawButton: aRect withClip: clip];
@ -2052,16 +2052,16 @@ typedef enum {
default:
case NSTopTabsBezelBorder:
{
NSRect clip = aRect;
const NSRect clip = aRect;
aRect.size.height += 1;
aRect.origin.y -= 1;
[self drawButton: aRect withClip: clip];
break;
}
case NSBottomTabsBezelBorder:
{
NSRect clip = aRect;
const NSRect clip = aRect;
aRect.size.height += 2;
aRect.origin.y -= 2;
[self drawButton: aRect withClip: clip];
break;
}
@ -2111,11 +2111,11 @@ typedef enum {
default:
case NSTopTabsBezelBorder:
aRect.size.height -= tabHeight;
aRect.origin.y += tabHeight;
break;
case NSBottomTabsBezelBorder:
aRect.size.height -= tabHeight;
aRect.origin.y += tabHeight;
break;
case NSLeftTabsBezelBorder:
@ -2141,7 +2141,7 @@ typedef enum {
|| type == NSTopTabsBezelBorder)
{
NSPoint iP;
if (type == NSBottomTabsBezelBorder)
if (type == NSTopTabsBezelBorder)
iP = bounds.origin;
else
iP = NSMakePoint(aRect.origin.x, NSMaxY(aRect));
@ -2169,7 +2169,13 @@ typedef enum {
else
NSLog(@"Not finished yet. Luff ya.\n");
[part compositeToPoint: iP operation: NSCompositeSourceOver];
[part drawInRect: NSMakeRect(iP.x, iP.y, [part size].width, [part size].height)
fromRect: NSZeroRect
operation: NSCompositeSourceOver
fraction: 1.0
respectFlipped: YES
hints: nil];
iP.x += [part size].width;
}
else
@ -2193,7 +2199,13 @@ typedef enum {
else
NSLog(@"Not finished yet. Luff ya.\n");
[part compositeToPoint: iP operation: NSCompositeSourceOver];
[part drawInRect: NSMakeRect(iP.x, iP.y, [part size].width, [part size].height)
fromRect: NSZeroRect
operation: NSCompositeSourceOver
fraction: 1.0
respectFlipped: YES
hints: nil];
iP.x += [part size].width;
}
@ -2236,7 +2248,13 @@ typedef enum {
else
NSLog(@"Not finished yet. Luff ya.\n");
[part compositeToPoint: iP operation: NSCompositeSourceOver];
[part drawInRect: NSMakeRect(iP.x, iP.y, [part size].width, [part size].height)
fromRect: NSZeroRect
operation: NSCompositeSourceOver
fraction: 1.0
respectFlipped: YES
hints: nil];
iP.x += [part size].width;
// Draw the background fill

3
Source/NSTabView.m
View file

@ -94,13 +94,10 @@
[super dealloc];
}
/*
// FIXME: This should be defined
- (BOOL) isFlipped
{
return YES;
}
*/
// tab management.