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

First attempt at in window menus.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27649 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2009-01-22 09:19:22 +00:00
parent 66a99f1cf7
commit 511b5be242
5 changed files with 165 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/NSMenuView.m
View file

@ -296,10 +296,14 @@ _addLeftBorderOffsetToRect(NSRect aRect)
{
if (flag == YES && _horizontal == NO)
{
NSRect scRect = [[NSScreen mainScreen] frame];
GSIArray a = NSZoneMalloc(NSDefaultMallocZone(), sizeof(GSIArray_t));
GSIArrayInitWithZoneAndCapacity(a, NSDefaultMallocZone(), 8);
NSMapInsert(viewInfo, self, a);
scRect.size.height = [NSMenuView menuBarHeight];
[self setFrameSize: scRect.size];
}
else if (flag == NO && _horizontal == YES)
{
@ -644,13 +648,16 @@ _addLeftBorderOffsetToRect(NSRect aRect)
unsigned i;
unsigned howMany = [_itemCells count];
float currentX = 8;
NSRect scRect = [[NSScreen mainScreen] frame];
// NSRect scRect = [[NSScreen mainScreen] frame];
GSIArrayRemoveAllItems(cellRects);
/*
scRect.size.height = [NSMenuView menuBarHeight];
[self setFrameSize: scRect.size];
_cellSize.height = scRect.size.height;
*/
_cellSize.height = [NSMenuView menuBarHeight];
for (i = 0; i < howMany; i++)
{
@ -947,6 +954,7 @@ _addLeftBorderOffsetToRect(NSRect aRect)
{
NSRect aRect = [self rectOfItemAtIndex: i];
//NSLog(@"indexOfItemAtPoint called for %@ %@ %d %@", self, NSStringFromPoint(point), i, NSStringFromRect(aRect));
aRect = _addLeftBorderOffsetToRect(aRect);
if (NSMouseInRect(point, aRect, NO))
@ -1347,6 +1355,7 @@ _addLeftBorderOffsetToRect(NSRect aRect)
int index;
location = [_window mouseLocationOutsideOfEventStream];
index = [self indexOfItemAtPoint: location];
if (event == original)