gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 03:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSTabView.m (-minimumSize, -contentRect): Make the

Browse source 
* values
        here consistent with the code in GSThemeDrawing.
        * Source/GSThemeDrawing.m (-drawTabViewRect:...): Remove useless
        line of code. 


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36184 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-02-22 09:26:55 +00:00
parent ffa04cc800
commit a070f43ca7
3 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-02-22 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTabView.m (-minimumSize, -contentRect): Make the values
here consistent with the code in GSThemeDrawing.
* Source/GSThemeDrawing.m (-drawTabViewRect:...): Remove useless
line of code.
2013-02-21 Riccardo Mottola <rm@gnu.org>
* Source/NSParagraphStyle.m

1
Source/GSThemeDrawing.m
View file

@ -1693,7 +1693,6 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
aRect.size.height -= 16;
aRect.origin.y += 16;
[self drawButton: aRect withClip: rect];
aRect.origin.y -= 16;
break;
case NSLeftTabsBezelBorder:

54
Source/NSTabView.m
View file

@ -386,21 +386,20 @@
- (NSSize) minimumSize
{
// FIXME: This should allow some space for the tabs
switch (_type)
{
case NSTopTabsBezelBorder:
return NSMakeSize(2, 19.5);
return NSMakeSize(3, 19);
case NSNoTabsBezelBorder:
return NSMakeSize(2, 3);
return NSMakeSize(3, 3);
case NSNoTabsLineBorder:
return NSMakeSize(2, 3);
return NSMakeSize(2, 2);
case NSBottomTabsBezelBorder:
return NSMakeSize(2, 16);
return NSMakeSize(3, 19);
case NSLeftTabsBezelBorder:
return NSMakeSize(16, 3);
return NSMakeSize(21, 3);
case NSRightTabsBezelBorder:
return NSMakeSize(16, 3);
return NSMakeSize(21, 3);
case NSNoTabsNoBorder:
default:
return NSZeroSize;
@ -411,42 +410,43 @@
{
NSRect cRect = _bounds;
/*
FIXME: All these numbers seem wrong to me.
For a bezel border we loose 2 pixel on each side,
for a line border 1 pixel. On top of that we will
need the space for the tab.
*/
switch (_type)
{
case NSTopTabsBezelBorder:
cRect.origin.y += 1;
cRect.origin.x += 0.5;
cRect.size.width -= 2;
cRect.size.height -= 18.5;
cRect.origin.x += 1;
cRect.origin.y += 1;
cRect.size.width -= 3;
cRect.size.height -= 19;
break;
case NSNoTabsBezelBorder:
cRect.origin.y += 1;
cRect.origin.x += 0.5;
cRect.size.width -= 2;
cRect.size.height -= 2;
cRect.origin.x += 1;
cRect.origin.y += 1;
cRect.size.width -= 3;
cRect.size.height -= 3;
break;
case NSNoTabsLineBorder:
cRect.origin.y += 1;
cRect.origin.x += 0.5;
cRect.origin.x += 1;
cRect.size.width -= 2;
cRect.size.height -= 2;
break;
case NSBottomTabsBezelBorder:
cRect.size.height -= 8;
cRect.origin.y = 8;
cRect.origin.x += 1;
cRect.origin.y += 19;
cRect.size.width -= 3;
cRect.size.height -= 19;
break;
case NSLeftTabsBezelBorder:
cRect.size.width -= 16;
cRect.origin.x += 16;
cRect.origin.x += 21;
cRect.origin.y += 1;
cRect.size.width -= 21;
cRect.size.height -= 3;
break;
case NSRightTabsBezelBorder:
cRect.size.width -= 16;
cRect.origin.x += 1;
cRect.origin.y += 1;
cRect.size.width -= 21;
cRect.size.height -= 3;
break;
case NSNoTabsNoBorder:
default: