mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 00:41:05 +00:00
Fix makeKey makeMain with defered windows
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13927 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
4ad8f481cf
commit
cc45d0eb88
3 changed files with 23 additions and 9 deletions
|
@ -1158,24 +1158,27 @@ static NSNotificationCenter *nc = nil;
|
|||
}
|
||||
}
|
||||
|
||||
/** Returns YES if the receiver can be made key. If this method returns
|
||||
NO, the window will not be made key. This implementation returns YES
|
||||
if the window is resizable or has a title bar. You can override this
|
||||
method to change it's behavior */
|
||||
- (BOOL) canBecomeKeyWindow
|
||||
{
|
||||
if (!_f.visible)
|
||||
return NO;
|
||||
if (_f.is_miniaturized)
|
||||
return NO;
|
||||
if ((NSResizableWindowMask | NSTitledWindowMask) & _styleMask)
|
||||
return YES;
|
||||
else
|
||||
return NO;
|
||||
}
|
||||
|
||||
/** Returns YES if the receiver can be the main window. If this method
|
||||
returns NO, the window will not become the main window. This
|
||||
implementation returns YES if the window is resizable or has a
|
||||
title bar and is visible and is not an NSPanel. You can override
|
||||
this method to change it's behavior */
|
||||
- (BOOL) canBecomeMainWindow
|
||||
{
|
||||
if (!_f.visible)
|
||||
return NO;
|
||||
if (_f.is_miniaturized)
|
||||
return NO;
|
||||
if ((NSResizableWindowMask | NSTitledWindowMask) & _styleMask)
|
||||
return YES;
|
||||
else
|
||||
|
@ -1235,7 +1238,7 @@ static NSNotificationCenter *nc = nil;
|
|||
|
||||
- (void) makeKeyWindow
|
||||
{
|
||||
if (_f.is_key == YES)
|
||||
if (!_f.visible || _f.is_miniaturized || _f.is_key == YES)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
@ -1248,7 +1251,7 @@ static NSNotificationCenter *nc = nil;
|
|||
|
||||
- (void) makeMainWindow
|
||||
{
|
||||
if (_f.is_main == YES)
|
||||
if (!_f.visible || _f.is_miniaturized || _f.is_main == YES)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue