From cb6f3d721e9c529b89e3f5ff0b7d05cc908810b9 Mon Sep 17 00:00:00 2001 From: gcasa Date: Mon, 18 Aug 2014 16:16:52 +0000 Subject: [PATCH] Change -[NSWindow constrainFrameRect:toScreen:] to correct x origin if needed. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38046 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 10 ++++++++++ Source/NSWindow.m | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9922b20a1..804bbf146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-08-18 12:14-EDT Gregory John Casamento + + * Source/NSWindow.m: Change code in + -[NSWindow constrainFrameRect:toScreen:] to contstrain + the X origin coordinate as well so that the window will appear + inside the screen if the saved coordinates are outside of the current + screen's range. This can occur of the .gorm file was made on a machine + with a larger screen geometry than the machine it is currently running + on. + 2014-07-25 Gregory John Casamento * Source/NSWindow.m: Remove code in (initWithContentRect:..) which diff --git a/Source/NSWindow.m b/Source/NSWindow.m index e5aa3e178..be58f5287 100644 --- a/Source/NSWindow.m +++ b/Source/NSWindow.m @@ -2105,6 +2105,13 @@ titleWithRepresentedFilename(NSString *representedFilename) { frameRect.origin.y -= difference; } + + /* Adjust X origin, if needed */ + difference = NSMaxX (frameRect) - NSMaxX (screenRect); + if (difference > 0) + { + frameRect.origin.x -= difference; + } /* If the window is resizable, resize it (if needed) so that the bottom edge is on the screen or can be on the screen when the user moves