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

Bugfixes for NSTabView

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7852 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
michael 2000-10-19 22:47:09 +00:00
parent c8abd35016
commit f2691db38d
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2000-10-19 Michael Hanni <mhanni@sprintmail.com>
* Source/NSTabView.m: a few bugfixes.
2000-10-17 Fred Kiefer <FredKiefer@gmx.de> 2000-10-17 Fred Kiefer <FredKiefer@gmx.de>
* Headers/gnustep/gui/NSPageLayout.h: * Headers/gnustep/gui/NSPageLayout.h:

30
Source/NSTabView.m
View file

@ -185,11 +185,13 @@
tab_selected_item = [tab_items indexOfObject: tab_selected]; tab_selected_item = [tab_items indexOfObject: tab_selected];
[tab_selected _setTabState: NSSelectedTab]; [tab_selected _setTabState: NSSelectedTab];
[self setNeedsDisplay: YES]; // [self setNeedsDisplay: YES];
if ([tab_selected view]) if ([tab_selected view])
[self addSubview: [tab_selected view]]; [self addSubview: [tab_selected view]];
[self setNeedsDisplay: YES];
if ([tab_delegate respondsToSelector: if ([tab_delegate respondsToSelector:
@selector(tabView: didSelectTabViewItem:)]) @selector(tabView: didSelectTabViewItem:)])
{ {
@ -287,20 +289,29 @@
- (NSRect) contentRect - (NSRect) contentRect
{ {
NSRect cRect = _frame; NSRect cRect = _bounds;
cRect.origin.x = 0; // cRect.origin.x = 0;
cRect.origin.y = 0; // cRect.origin.y = 0;
if (tab_type == NSTopTabsBezelBorder) if (tab_type == NSTopTabsBezelBorder)
{ {
cRect.origin.y = 0; cRect.origin.y += 1;
cRect.size.height -= 16; cRect.origin.x += 0.5;
cRect.size.width -= 2;
cRect.size.height -= 18.5;
}
if (tab_type == NSNoTabsBezelBorder)
{
cRect.origin.y += 1;
cRect.origin.x += 0.5;
cRect.size.width -= 2;
cRect.size.height -= 2;
} }
if (tab_type == NSBottomTabsBezelBorder) if (tab_type == NSBottomTabsBezelBorder)
{ {
NSLog(@"hehehe. %f", cRect.origin.y);
cRect.size.height -= 8; cRect.size.height -= 8;
cRect.origin.y = 8; cRect.origin.y = 8;
} }
@ -318,8 +329,7 @@
int i; int i;
NSRect previousRect; NSRect previousRect;
int previousState = 0; int previousState = 0;
NSRect aRect = _bounds;
rect = _bounds;
DPSgsave(ctxt); DPSgsave(ctxt);
@ -327,7 +337,7 @@
{ {
case NSTopTabsBezelBorder: case NSTopTabsBezelBorder:
rect.size.height -= 16; rect.size.height -= 16;
NSDrawButton(rect, rect); NSDrawButton(rect, NSZeroRect);
borderThickness = 2; borderThickness = 2;
break; break;