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

Merged Trunk changes from rev 35219 to TestPlant branch.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@36953 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Frank Le Grand 2013-08-09 14:24:48 +00:00
parent 343da32c8c
commit 4b27157a46
215 changed files with 13994 additions and 8840 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Source/NSBox.m
View file

@ -455,19 +455,21 @@
NSColor *color;
rect = NSIntersectionRect(_bounds, rect);
if (_transparent)
if (_box_type == NSBoxCustom)
{
color = [NSColor clearColor];
}
else if (_box_type == NSBoxCustom)
{
color = _fill_color;
if (_transparent)
{
color = [NSColor clearColor];
}
else
{
color = _fill_color;
}
}
else
{
color = [_window backgroundColor];
}
// Fill inside
[color set];
NSRectFill(rect);
@ -476,9 +478,8 @@
switch (_border_type)
{
case NSNoBorder:
break;
case NSLineBorder:
break;
case NSLineBorder:
if (_box_type == NSBoxCustom)
{
[_border_color set];
@ -489,15 +490,13 @@
[[NSColor controlDarkShadowColor] set];
NSFrameRect(_border_rect);
}
break;
break;
case NSBezelBorder:
[[GSTheme theme] drawDarkBezel: _border_rect withClip: rect];
break;
case NSGrooveBorder:
[[GSTheme theme] drawGroove: _border_rect withClip: rect];
break;
[[GSTheme theme] drawDarkBezel: _border_rect withClip: rect];
break;
case NSGrooveBorder:
[[GSTheme theme] drawGroove: _border_rect withClip: rect];
break;
}
// Draw title
@ -590,7 +589,7 @@
[aCoder encodeInt: [self borderType] forKey: @"NSBorderType"];
[aCoder encodeInt: [self boxType] forKey: @"NSBoxType"];
[aCoder encodeInt: [self titlePosition] forKey: @"NSTitlePosition"];
[aCoder encodeBool: _transparent forKey: @"NSTransparent"];
[aCoder encodeBool: _transparent forKey: @"NSFullyTransparent"];
[aCoder encodeSize: [self contentViewMargins] forKey: @"NSOffsets"];
}
else
@ -630,14 +629,15 @@
[self setTitlePosition: titlePosition];
}
if ([aDecoder containsValueForKey: @"NSTransparent"])
{
_transparent = [aDecoder decodeBoolForKey: @"NSTransparent"];
}
{
// On Apple this is always NO, we keep it for old GNUstep archives
_transparent = [aDecoder decodeBoolForKey: @"NSTransparent"];
}
if ([aDecoder containsValueForKey: @"NSFullyTransparent"])
{
_transparent = [aDecoder decodeBoolForKey: @"NSFullyTransparent"];
}
if ([aDecoder containsValueForKey: @"NSOffsets"])
{
_transparent = [aDecoder decodeBoolForKey: @"NSFullyTransparent"];
}
if ([aDecoder containsValueForKey: @"NSOffsets"])
{
[self setContentViewMargins: [aDecoder decodeSizeForKey: @"NSOffsets"]];
}