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

* Source/GSThemeDrawing.m (NSBox): If drawing with theme tiles,

Browse source 
use actual clipping to clip a hole in the border, so we can avoid
filling anything with the background color.
* Source/NSBox.m (-isOpaque:): change to NO.


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

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-10-08 Eric Wasylishen <ewasylishen@gmail.com>
* Source/GSThemeDrawing.m (NSBox): If drawing with theme tiles,
use actual clipping to clip a hole in the border, so we can avoid
filling anything with the background color.
* Source/NSBox.m (-isOpaque:): change to NO.
2013-10-08 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSTabView.m: Uncomment - (BOOL) isFlipped { return YES; }

81
Source/GSThemeDrawing.m
View file

@ -3061,6 +3061,7 @@ typedef enum {
inView: (NSBox *)box
{
NSColor *color;
BOOL drawTitleBackground = YES;
if (boxType == NSBoxCustom)
{
@ -3077,9 +3078,7 @@ typedef enum {
{
color = [[box window] backgroundColor];
}
// Fill inside
[color set];
NSRectFill(clipRect);
// Draw border
@ -3090,6 +3089,10 @@ typedef enum {
|| boxType == NSBoxOldStyle
|| boxType == NSBoxCustom)
{
// Fill inside
[color set];
NSRectFill(clipRect);
switch (borderType)
{
case NSNoBorder:
@ -3116,21 +3119,81 @@ typedef enum {
}
else
{
drawTitleBackground = NO;
// If the title is on the border, clip a hole in the later
[NSGraphicsContext saveGraphicsState];
if ((borderType != NSNoBorder)
&& (([box titlePosition] == NSAtTop) || ([box titlePosition] == NSAtBottom)))
{
const NSRect borderRect = [box borderRect];
const NSRect titleRect = [box titleRect];
NSBezierPath *path = [NSBezierPath bezierPath];
// Left
if (NSMinX(titleRect) > NSMinX(borderRect))
{
NSRect left = borderRect;
left.size.width = NSMinX(titleRect) - NSMinX(borderRect);
[path appendBezierPathWithRect: left];
}
// Right
if (NSMaxX(borderRect) > NSMaxX(titleRect))
{
NSRect right = borderRect;
right.size.width = NSMaxX(borderRect) - NSMaxX(titleRect);
right.origin.x = NSMaxX(titleRect);
[path appendBezierPathWithRect: right];
}
// MinY
if (NSMinY(titleRect) > NSMinY(borderRect))
{
NSRect minY = borderRect;
minY.size.height = NSMinY(titleRect) - NSMinY(borderRect);
[path appendBezierPathWithRect: minY];
}
// MaxY
if (NSMaxY(borderRect) > NSMaxY(titleRect))
{
NSRect maxY = borderRect;
maxY.size.height = NSMaxY(borderRect) - NSMaxY(titleRect);
maxY.origin.y = NSMaxY(titleRect);
[path appendBezierPathWithRect: maxY];
}
if (![path isEmpty])
{
[path addClip];
}
}
[[GSTheme theme] fillRect: [box borderRect]
withTiles: tiles
background: [NSColor clearColor]];
// Restore clipping path
[NSGraphicsContext restoreGraphicsState];
}
// Draw title
if ([box titlePosition] != NSNoTitle)
{
// If the title is on the border, clip a hole in the later
if ((borderType != NSNoBorder)
&& (([box titlePosition] == NSAtTop) || ([box titlePosition] == NSAtBottom)))
{
[color set];
NSRectFill([box titleRect]);
}
if (drawTitleBackground
&& (borderType != NSNoBorder)
&& (([box titlePosition] == NSAtTop) || ([box titlePosition] == NSAtBottom)))
{
[color set];
NSRectFill([box titleRect]);
}
[[box titleCell] drawWithFrame: [box titleRect] inView: box];
}
}

20
Source/NSBox.m
View file

@ -462,14 +462,18 @@
- (BOOL) isOpaque
{
if (_box_type == NSBoxCustom)
{
return !_transparent;
}
else
{
return YES;
}
// FIXME: Depends on theme; if always returning NO is a performance hit
// we can check if GSTheme is going to draw an old-style opaque box
// or not.
return NO;
// if (_box_type == NSBoxCustom)
// {
// return !_transparent;
// }
// else
// {
// return YES;
// }
}
- (NSColor*) fillColor