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

update fixes and title view adding/removal changes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16279 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sergii Stoian 2003-03-27 16:18:02 +00:00
parent 92d9403935
commit 1e848bde2d
1 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
Source/NSMenuView.m
View file

@ -57,6 +57,7 @@
{ {
NSMenu *menu; NSMenu *menu;
NSButton *button; NSButton *button;
NSSize imageSize;
NSDictionary *attr; NSDictionary *attr;
} }
@ -139,11 +140,6 @@ _addLeftBorderOffsetToRect(NSRect aRect)
// Create an array to store our menu item cells. // Create an array to store our menu item cells.
_itemCells = [NSMutableArray new]; _itemCells = [NSMutableArray new];
// Add title view. If this menu owned by popup
_titleView = [[NSMenuWindowTitleView alloc] init];
[self addSubview: _titleView];
[_titleView release];
return self; return self;
} }
@ -457,10 +453,25 @@ _addLeftBorderOffsetToRect(NSRect aRect)
{ {
NSDebugLLog (@"NSMenu", @"update called on menu view"); NSDebugLLog (@"NSMenu", @"update called on menu view");
[_titleView setMenu: _menu]; if (![_menu _ownedByPopUp] && !_titleView)
{
// Add title view. If this menu not owned by popup
_titleView = [[NSMenuWindowTitleView alloc] init];
[self addSubview: _titleView];
[_titleView release];
}
else if ([_menu _ownedByPopUp] && _titleView)
{
// Remove title view if this menu owned by popup
[_titleView removeFromSuperview];
_titleView = nil;
}
if (_needsSizing) if ([_titleView menu] == nil && _titleView)
[self sizeToFit]; [_titleView setMenu: _menu];
// Resize it anyway.
[self sizeToFit];
if ([_menu isTornOff] && ![_menu isTransient]) if ([_menu isTornOff] && ![_menu isTransient])
{ {
@ -804,19 +815,11 @@ _addLeftBorderOffsetToRect(NSRect aRect)
cellFrame.origin = [_window convertScreenToBase: screenRect.origin]; cellFrame.origin = [_window convertScreenToBase: screenRect.origin];
cellFrame = [self convertRect: cellFrame fromView: nil]; cellFrame = [self convertRect: cellFrame fromView: nil];
// Remove title view if we owned by popup button // Only call update if needed.
if ([_menu _ownedByPopUp] && _titleView)
{
[_titleView removeFromSuperview];
_titleView = nil;
_needsSizing = YES;
}
// Only call sizeToFit if needed.
if ((NSEqualSizes(_cellSize, cellFrame.size) == NO) || _needsSizing) if ((NSEqualSizes(_cellSize, cellFrame.size) == NO) || _needsSizing)
{ {
_cellSize = cellFrame.size; _cellSize = cellFrame.size;
[self sizeToFit]; [self update];
} }
/* /*
@ -1375,7 +1378,6 @@ _addLeftBorderOffsetToRect(NSRect aRect)
return _itemCells; return _itemCells;
} }
@end @end
@implementation NSMenuWindowTitleView @implementation NSMenuWindowTitleView
@ -1508,11 +1510,12 @@ _addLeftBorderOffsetToRect(NSRect aRect)
// create the menu's close button // create the menu's close button
NSImage *closeImage = [NSImage imageNamed: @"common_Close"]; NSImage *closeImage = [NSImage imageNamed: @"common_Close"];
NSImage *closeHImage = [NSImage imageNamed: @"common_CloseH"]; NSImage *closeHImage = [NSImage imageNamed: @"common_CloseH"];
NSSize imageSize = [closeImage size]; NSRect rect;
NSRect rect = {
{ _frame.size.width - imageSize.width - 4, imageSize = [closeImage size];
(_frame.size.height - imageSize.height) / 2 }, rect = NSMakeRect (_frame.size.width - imageSize.width - 4,
{ imageSize.width, imageSize.height } }; (_frame.size.height - imageSize.height) / 2 ,
imageSize.width, imageSize.height );
button = [[NSButton alloc] initWithFrame: rect]; button = [[NSButton alloc] initWithFrame: rect];
[button setRefusesFirstResponder: YES]; [button setRefusesFirstResponder: YES];
@ -1538,6 +1541,12 @@ _addLeftBorderOffsetToRect(NSRect aRect)
{ {
if (button == nil) if (button == nil)
[self createButton]; [self createButton];
// Update location
[button setFrameOrigin:
NSMakePoint (_frame.size.width - imageSize.width - 4,
(_frame.size.height - imageSize.height) / 2)];
[self addSubview: button]; [self addSubview: button];
[self setNeedsDisplay: YES]; [self setNeedsDisplay: YES];
} }