gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-20 14:36:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch by Matt Rice to get popup buttons that support

Browse source 
setUsesItemFromMenu: set to NO.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26036 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2008-02-07 19:12:59 +00:00
parent d5e445c620
commit 65ceda6b9d
5 changed files with 69 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Source/NSMenuView.m
View file

@ -37,6 +37,7 @@
#include "AppKit/NSMenuView.h"
#include "AppKit/NSMenu.h"
#include "AppKit/NSButton.h"
#include "AppKit/NSPopUpButtonCell.h"
#include "AppKit/NSWindow.h"
#include "AppKit/PSOperators.h"
#include "AppKit/NSImage.h"
@ -606,17 +607,17 @@ _addLeftBorderOffsetToRect(NSRect aRect)
[self sizeToFit];
if ([_attachedMenu _ownedByPopUp] == NO)
if (_titleView != nil)
{
if ([_attachedMenu isTornOff] && ![_attachedMenu isTransient])
{
[_titleView
addCloseButtonWithAction: @selector(_performMenuClose:)];
}
{
[_titleView
addCloseButtonWithAction: @selector(_performMenuClose:)];
}
else
{
[_titleView removeCloseButton];
}
{
[_titleView removeCloseButton];
}
}
}
@ -1076,18 +1077,26 @@ _addLeftBorderOffsetToRect(NSRect aRect)
}
// Update position, if needed, using the preferredEdge
if (edge == NSMaxYEdge)
{
screenFrame.origin.y += screenRect.size.height;
}
else if (edge == NSMaxXEdge)
{
screenFrame.origin.x += screenRect.size.width;
}
else if (edge == NSMinXEdge)
{
screenFrame.origin.x -= screenRect.size.width;
}
if (edge == NSMinYEdge)
{
if ([_attachedMenu _ownedByPopUp] &&
([[_attachedMenu _owningPopUp] usesItemFromMenu] == NO))
{
screenFrame.origin.y -= screenRect.size.height;
}
}
else if (edge == NSMaxYEdge)
{
screenFrame.origin.y += screenRect.size.height;
}
else if (edge == NSMaxXEdge)
{
screenFrame.origin.x += screenRect.size.width;
}
else if (edge == NSMinXEdge)
{
screenFrame.origin.x -= screenRect.size.width;
}
// Get the frameRect
r = [NSWindow frameRectForContentRect: screenFrame