mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 07:00:46 +00:00
fix for activation with suppressed icon window
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28837 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
d2f51e9cde
commit
161d6e03e7
2 changed files with 26 additions and 3 deletions
|
@ -1377,6 +1377,22 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
|
|||
}
|
||||
}
|
||||
|
||||
if (YES == [[NSUserDefaults standardUserDefaults]
|
||||
boolForKey: @"GSSuppressAppIcon"])
|
||||
{
|
||||
#if MINI_ICON
|
||||
NSRect f = [[[self mainMenu] window] frame];
|
||||
NSPoint p = f.origin;
|
||||
|
||||
p.y += f.size.height;
|
||||
[_app_icon_window setFrameTopLeftPoint: p];
|
||||
[_app_icon_window orderFrontRegardless];
|
||||
[_app_icon_window miniaturize: self];
|
||||
#else
|
||||
[_app_icon_window orderFrontRegardless];
|
||||
#endif
|
||||
}
|
||||
|
||||
info = [self _notificationUserInfo];
|
||||
[nc postNotificationName: NSApplicationDidResignActiveNotification
|
||||
object: self
|
||||
|
|
|
@ -1727,8 +1727,8 @@ many times.
|
|||
NSString *aString;
|
||||
|
||||
aString = [NSString stringWithFormat: @"%@ -- %@",
|
||||
[_representedFilename lastPathComponent],
|
||||
[_representedFilename stringByDeletingLastPathComponent]];
|
||||
[_representedFilename lastPathComponent],
|
||||
[_representedFilename stringByDeletingLastPathComponent]];
|
||||
isFileName = [_windowTitle isEqual: aString];
|
||||
|
||||
[NSApp addWindowsItem: self
|
||||
|
@ -2679,8 +2679,15 @@ resetCursorRectsForView(NSView *theView)
|
|||
_f.visible = YES;
|
||||
if (self == [NSApp iconWindow])
|
||||
{
|
||||
[NSApp unhide: self];
|
||||
[self orderOut: self];
|
||||
if ([NSApp isActive] == NO)
|
||||
{
|
||||
[NSApp activateIgnoringOtherApps: YES];
|
||||
}
|
||||
if ([NSApp isHidden] == YES)
|
||||
{
|
||||
[NSApp unhide: self];
|
||||
}
|
||||
}
|
||||
[nc postNotificationName: NSWindowDidDeminiaturizeNotification
|
||||
object: self];
|
||||
|
|
Loading…
Reference in a new issue