Revision: 2669
http://skim-app.svn.sourceforge.net/skim-app/?rev=2669&view=rev
Author: hofman
Date: 2007-08-16 09:51:04 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Always move full screen related windows to the correct screen when showing
them. Hopefully this fixes problems reported on the users list.
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKSideWindow.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-08-16 13:36:14 UTC (rev 2668)
+++ trunk/SKMainWindowController.m 2007-08-16 16:51:04 UTC (rev 2669)
@@ -1863,12 +1863,11 @@
NSScreen *screen = [[self window] screen];
if (screen == nil)
screen = [NSScreen mainScreen];
- if (leftSideWindow == nil) {
+ if (leftSideWindow == nil)
leftSideWindow = [[SKSideWindow alloc] initWithMainController:self
edge:NSMinXEdge];
- } else if (screen != [leftSideWindow screen]) {
- [leftSideWindow moveToScreen:screen];
- }
+ [leftSideWindow moveToScreen:screen];
+
if ([[mainWindow firstResponder] isDescendantOf:leftSideContentView])
[mainWindow makeFirstResponder:nil];
[leftSideWindow setMainView:leftSideContentView];
@@ -1895,12 +1894,11 @@
NSScreen *screen = [[self window] screen]; // @@ or should we use the main
screen?
if (screen == nil)
screen = [NSScreen mainScreen];
- if (rightSideWindow == nil) {
+ if (rightSideWindow == nil)
rightSideWindow = [[SKSideWindow alloc] initWithMainController:self
edge:NSMaxXEdge];
- } else if (screen != [rightSideWindow screen]) {
- [rightSideWindow moveToScreen:screen];
- }
+ [rightSideWindow moveToScreen:screen];
+
if ([[mainWindow firstResponder] isDescendantOf:rightSideContentView])
[mainWindow makeFirstResponder:nil];
[rightSideWindow setMainView:rightSideContentView];
@@ -1989,9 +1987,7 @@
}
// explicitly set window frame; screen may have moved, or may be nil (in
which case [fullScreenWindow frame] is wrong, which is weird); the first time
through this method, [fullScreenWindow screen] is nil
- if ([screen isEqual:[fullScreenWindow screen]] == NO) {
- [fullScreenWindow setFrame:[screen frame] display:NO];
- }
+ [fullScreenWindow setFrame:[screen frame] display:NO];
if ([[mainWindow firstResponder] isDescendantOf:pdfView])
[mainWindow makeFirstResponder:nil];
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2007-08-16 13:36:14 UTC (rev 2668)
+++ trunk/SKSideWindow.m 2007-08-16 16:51:04 UTC (rev 2669)
@@ -73,7 +73,6 @@
[self setReleasedWhenClosed:NO];
[self setHidesOnDeactivate:YES];
[self setLevel:NSFloatingWindowLevel];
- [self moveToScreen:screen];
}
return self;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
