gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-01 10:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSApplication.m: Fix bug #24643. Application icon is no

Browse source 
stored correctly.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28021 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2009-03-02 01:10:23 +00:00
parent 575463949f
commit ef2a8fdcd6
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-03-01 20:17-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSApplication.m: Fix bug #24643. Application icon is no
stored correctly.
2009-03-01 Fred Kiefer <FredKiefer@gmx.de> 2009-03-01 Fred Kiefer <FredKiefer@gmx.de>
* Resources/English.lproj/Localizable.strings: Regenerate this file. * Resources/English.lproj/Localizable.strings: Regenerate this file.

16
Source/NSApplication.m
View file

@ -955,11 +955,13 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
{ {
image = [NSImage imageNamed: @"GNUstep"]; image = [NSImage imageNamed: @"GNUstep"];
} }
[self setApplicationIconImage: image];
if (![defs boolForKey: @"GSSuppressAppIcon"]) if (![defs boolForKey: @"GSSuppressAppIcon"])
{ {
[self _appIconInit]; [self _appIconInit];
} }
[self setApplicationIconImage: image];
mainModelFile = [infoDict objectForKey: @"NSMainNibFile"]; mainModelFile = [infoDict objectForKey: @"NSMainNibFile"];
if (mainModelFile != nil && [mainModelFile isEqual: @""] == NO) if (mainModelFile != nil && [mainModelFile isEqual: @""] == NO)
@ -2179,7 +2181,7 @@ image.</p><p>See Also: -applicationIconImage</p>
NSEnumerator *iterator = [[self windows] objectEnumerator]; NSEnumerator *iterator = [[self windows] objectEnumerator];
NSWindow *current; NSWindow *current;
NSImage *old_app_icon = _app_icon; NSImage *old_app_icon = _app_icon;
NSSize miniWindowSize; NSSize miniWindowSize = [GSCurrentServer() iconSize];
NSSize imageSize = [anImage size]; NSSize imageSize = [anImage size];
RETAIN(old_app_icon); RETAIN(old_app_icon);
@ -2187,18 +2189,10 @@ image.</p><p>See Also: -applicationIconImage</p>
[anImage setName: @"NSApplicationIcon"]; [anImage setName: @"NSApplicationIcon"];
[anImage setScalesWhenResized: YES]; [anImage setScalesWhenResized: YES];
if (_app_icon_window == nil) if (miniWindowSize.width <= 0 || miniWindowSize.height <= 0)
{ {
miniWindowSize = NSMakeSize(48, 48); miniWindowSize = NSMakeSize(48, 48);
} }
else
{
miniWindowSize = [_app_icon_window frame].size;
if (miniWindowSize.width <= 0 || miniWindowSize.height <= 0)
{
miniWindowSize = NSMakeSize(48, 48);
}
}
// restrict size when the icon is larger than the mini window. // restrict size when the icon is larger than the mini window.
if (imageSize.width > miniWindowSize.width if (imageSize.width > miniWindowSize.width