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

* Source/GSStandardWindowDecorationView.m: Use bounds rect instead

Browse source 
of frame rect when laying out the window parts (title bar, etc).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@32886 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2011-04-18 20:49:39 +00:00
parent e1e89d3818
commit 0fccc78bad
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-04-18 Eric Wasylishen <ewasylishen@gmail.com>
* Source/GSStandardWindowDecorationView.m: Use bounds rect instead
of frame rect when laying out the window parts (title bar, etc).
2011-04-18 Fred Kiefer <FredKiefer@gmx.de> 2011-04-18 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSXibLoader.m: Rewrote the handling of the data * Source/GSXibLoader.m: Rewrote the handling of the data

12
Source/GSStandardWindowDecorationView.m
View file

@ -99,24 +99,24 @@
{ {
float titleHeight = [theme titlebarHeight]; float titleHeight = [theme titlebarHeight];
titleBarRect = NSMakeRect(0.0, _frame.size.height - titleHeight, titleBarRect = NSMakeRect(0.0, [self bounds].size.height - titleHeight,
_frame.size.width, titleHeight); [self bounds].size.width, titleHeight);
} }
if (hasResizeBar) if (hasResizeBar)
{ {
resizeBarRect = NSMakeRect(0.0, 0.0, _frame.size.width, [theme resizebarHeight]); resizeBarRect = NSMakeRect(0.0, 0.0, [self bounds].size.width, [theme resizebarHeight]);
} }
if (hasCloseButton) if (hasCloseButton)
{ {
closeButtonRect = NSMakeRect( closeButtonRect = NSMakeRect(
_frame.size.width - 15 - 4, _frame.size.height - 15 - 4, 15, 15); [self bounds].size.width - 15 - 4, [self bounds].size.height - 15 - 4, 15, 15);
[closeButton setFrame: closeButtonRect]; [closeButton setFrame: closeButtonRect];
} }
if (hasMiniaturizeButton) if (hasMiniaturizeButton)
{ {
miniaturizeButtonRect = NSMakeRect( miniaturizeButtonRect = NSMakeRect(
4, _frame.size.height - 15 - 4, 15, 15); 4, [self bounds].size.height - 15 - 4, 15, 15);
[miniaturizeButton setFrame: miniaturizeButtonRect]; [miniaturizeButton setFrame: miniaturizeButtonRect];
} }
} }
@ -180,7 +180,7 @@
- (void) drawRect: (NSRect)rect - (void) drawRect: (NSRect)rect
{ {
[[GSTheme theme] drawWindowBorder: rect [[GSTheme theme] drawWindowBorder: rect
withFrame: _frame withFrame: [self bounds]
forStyleMask: [window styleMask] forStyleMask: [window styleMask]
state: inputState state: inputState
andTitle: [window title]]; andTitle: [window title]];