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

* Source/NSWindow.m: Remove unnecessary FIXMEs related to

Browse source 
user space scale factor
* Source/NSAppliation.m: Correct app icon sizing which was
mixing up window frame coordinates and user space coordinates
* Source/NSCachedImageRep.m: Add NSUnscaledWindowMask to the
window used internally


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@32897 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2011-04-19 08:23:01 +00:00
parent b4e8ecd7cf
commit 346f604cb7
4 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2011-04-18 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSWindow.m: Remove unnecessary FIXMEs related to
user space scale factor
* Source/NSAppliation.m: Correct app icon sizing which was
mixing up window frame coordinates and user space coordinates
* Source/NSCachedImageRep.m: Add NSUnscaledWindowMask to the
window used internally
2011-04-18 Eric Wasylishen <ewasylishen@gmail.com> 2011-04-18 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSScreen.m (-userSpaceScaleFactor): * Source/NSScreen.m (-userSpaceScaleFactor):

19
Source/NSApplication.m
View file

@ -3761,7 +3761,6 @@ struct _DelegateWrapper
- _appIconInit - _appIconInit
{ {
NSAppIconView *iv; NSAppIconView *iv;
NSRect iconRect;
unsigned mask = NSIconWindowMask; unsigned mask = NSIconWindowMask;
BOOL suppress; BOOL suppress;
@ -3780,13 +3779,19 @@ struct _DelegateWrapper
defer: NO defer: NO
screen: nil]; screen: nil];
iconRect = GSGetIconFrame(_app_icon_window);
[_app_icon_window setFrame: iconRect display: YES];
iv = [[NSAppIconView alloc] initWithFrame: iconRect];
[iv setImage: _app_icon]; {
[_app_icon_window setContentView: iv]; NSRect iconContentRect = GSGetIconFrame(_app_icon_window);
RELEASE(iv); NSRect iconFrame = [_app_icon_window frameRectForContentRect: iconContentRect];
NSRect iconViewFrame = NSMakeRect(0, 0, iconContentRect.size.width, iconContentRect.size.height);
[_app_icon_window setFrame: iconFrame display: YES];
iv = [[NSAppIconView alloc] initWithFrame: iconViewFrame];
[iv setImage: _app_icon];
[_app_icon_window setContentView: iv];
RELEASE(iv);
}
if (NO == suppress) if (NO == suppress)
{ {

4
Source/NSCachedImageRep.m
View file

@ -92,7 +92,7 @@
frame.origin = NSMakePoint(0,0); frame.origin = NSMakePoint(0,0);
frame.size = aSize; frame.size = aSize;
win = [[GSCacheW alloc] initWithContentRect: frame win = [[GSCacheW alloc] initWithContentRect: frame
styleMask: NSBorderlessWindowMask styleMask: NSBorderlessWindowMask | NSUnscaledWindowMask
backing: NSBackingStoreRetained backing: NSBackingStoreRetained
defer: NO]; defer: NO];
self = [self initWithWindow: win rect: frame]; self = [self initWithWindow: win rect: frame];
@ -136,7 +136,7 @@
} }
if (!_window) if (!_window)
_window = [[GSCacheW alloc] initWithContentRect: _rect _window = [[GSCacheW alloc] initWithContentRect: _rect
styleMask: NSBorderlessWindowMask styleMask: NSBorderlessWindowMask | NSUnscaledWindowMask
backing: NSBackingStoreRetained backing: NSBackingStoreRetained
defer: NO]; defer: NO];
[self setSize: _rect.size]; [self setSize: _rect.size];

2
Source/NSWindow.m
View file

@ -2272,7 +2272,6 @@ many times.
*/ */
- (NSPoint) convertBaseToScreen: (NSPoint)aPoint - (NSPoint) convertBaseToScreen: (NSPoint)aPoint
{ {
// FIXME: Apply userSpaceScaleFactor?
NSPoint screenPoint; NSPoint screenPoint;
screenPoint.x = _frame.origin.x + aPoint.x; screenPoint.x = _frame.origin.x + aPoint.x;
@ -2286,7 +2285,6 @@ many times.
*/ */
- (NSPoint) convertScreenToBase: (NSPoint)aPoint - (NSPoint) convertScreenToBase: (NSPoint)aPoint
{ {
// FIXME: Apply userSpaceScaleFactor?
NSPoint basePoint; NSPoint basePoint;
basePoint.x = aPoint.x - _frame.origin.x; basePoint.x = aPoint.x - _frame.origin.x;