Merge fixes and additional merges

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38682 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-25 18:51:04 +00:00
parent 9ad8451677
commit ce265f56f8
8 changed files with 260 additions and 114 deletions

View file

@ -501,11 +501,13 @@ static BOOL menuBarVisible = YES;
}
}
origin = NSMakePoint(0, [[_aWindow screen] visibleFrame].size.height
- [_aWindow frame].size.height);
if ((_aWindow != nil) && ([_aWindow screen] != nil))
{
origin = NSMakePoint(0, [[_aWindow screen] visibleFrame].size.height - [_aWindow frame].size.height);
[_aWindow setFrameOrigin: origin];
[_bWindow setFrameOrigin: origin];
[_aWindow setFrameOrigin: origin];
[_bWindow setFrameOrigin: origin];
}
}
}