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

* Source/GSXibLoader.m (-awake:inContainer:withContext:): Allow

Browse source 
for subclasses of NSApplication as rootObjects.
        Based on patch by Marcian Lytwyn <gna@advcsi.com>.
        * Source/NSWindow.m (-userSpaceScaleFactor): Handle case where
        _screen is nil.
        Patch by Doug Simons (dsimons@testplant.com).
        * Source/NSWindow.m (-_screenForFrame:): Require real overlapp.
        Patch by Doug Simons (dsimons@testplant.com).
        * Source/NSTextField.m (-textDidChange:): Improve editing
        behavior when formatter returns a new string.
        Patch by Doug Simons (dsimons@testplant.com).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37830 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2014-05-03 21:45:47 +00:00
parent fc150231a2
commit 38af0dc88b
4 changed files with 52 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/NSWindow.m
View file

@ -389,7 +389,7 @@ has blocked and waited for events.
*/
- (NSScreen *) _screenForFrame: (NSRect)frame
{
NSInteger largest = -1;
CGFloat largest = 0.0;
NSArray *screens = [NSScreen screens];
NSInteger index = 0;
NSScreen *theScreen = nil;
@ -399,7 +399,8 @@ has blocked and waited for events.
NSScreen *screen = [screens objectAtIndex: index];
NSRect sframe = [screen frame];
NSRect iframe = NSIntersectionRect(frame, sframe);
NSInteger isize = NSWidth(iframe) * NSHeight(iframe);
CGFloat isize = NSWidth(iframe) * NSHeight(iframe);
if (isize > largest)
{
largest = isize;
@ -1386,9 +1387,13 @@ titleWithRepresentedFilename(NSString *representedFilename)
{
return 1.0;
}
else if (_screen != nil)
{
return [_screen userSpaceScaleFactor];
}
else
{
return [_screen userSpaceScaleFactor];
return 1.0;
}
}
@ -2117,7 +2122,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
difference = NSMaxY (screenRect) - NSMaxY (frameRect);
if (_styleMask & NSResizableWindowMask)
{
float difference2;
CGFloat difference2;
difference2 = screenRect.origin.y - frameRect.origin.y;
difference2 -= difference;