mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-02-24 20:11:20 +00:00
* Palettes/0Menus/GormNSMenu.m: Remove call to setMenu: in _createWindow since it's not needed and was causing display issues. * Palettes/0Menus/GormNSMenuView.m: Use new method in NSMenuView to reduce code duplication. Corrections for bug #25401. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@27681 72102866-910b-0410-8b05-ffd578937521
71 lines
1.9 KiB
Objective-C
71 lines
1.9 KiB
Objective-C
/** <title>GormNSMenuView</title>
|
|
|
|
Copyright (C) 2007 Free Software Foundation, Inc.
|
|
|
|
Author: Gregory Casamento <greg.casamento@gmail.com>
|
|
Date: 2007
|
|
|
|
This file is part of the GNUstep GUI Library.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 3 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; see the file COPYING.LIB.
|
|
If not, write to the Free Software Foundation,
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#include <Foundation/Foundation.h>
|
|
#include <AppKit/AppKit.h>
|
|
#include "GormNSMenuView.h"
|
|
|
|
@implementation GormNSMenuView
|
|
- (BOOL) _executeItemAtIndex: (int)indexOfActionToExecute
|
|
removeSubmenu: (BOOL)subMenusNeedRemoving
|
|
{
|
|
if (indexOfActionToExecute == -1)
|
|
{
|
|
return YES;
|
|
}
|
|
|
|
if (indexOfActionToExecute >= 0
|
|
&& [[self menu] attachedMenu] != nil && [[self menu] attachedMenu] ==
|
|
[[[[self menu] itemArray] objectAtIndex: indexOfActionToExecute] submenu])
|
|
{
|
|
if (subMenusNeedRemoving)
|
|
{
|
|
[self detachSubmenu];
|
|
}
|
|
return NO;
|
|
}
|
|
|
|
return YES;
|
|
}
|
|
|
|
- (NSPoint) locationForSubmenu: (NSMenu *)aSubmenu
|
|
{
|
|
NSRect frame = [_window frame];
|
|
NSRect submenuFrame;
|
|
|
|
if (_needsSizing)
|
|
[self sizeToFit];
|
|
|
|
if (aSubmenu)
|
|
submenuFrame = [[[aSubmenu menuRepresentation] window] frame];
|
|
else
|
|
submenuFrame = NSZeroRect;
|
|
|
|
return NSMakePoint(NSMaxX(frame),
|
|
NSMaxY(frame) - NSHeight(submenuFrame));
|
|
|
|
}
|
|
@end
|
|
|