Revision: 6655
http://skim-app.svn.sourceforge.net/skim-app/?rev=6655&view=rev
Author: hofman
Date: 2010-07-26 12:58:34 +0000 (Mon, 26 Jul 2010)
Log Message:
-----------
no need to move nav window because we always recreate it
Modified Paths:
--------------
trunk/SKNavigationWindow.h
trunk/SKNavigationWindow.m
trunk/SKPDFView.m
Modified: trunk/SKNavigationWindow.h
===================================================================
--- trunk/SKNavigationWindow.h 2010-07-26 12:16:58 UTC (rev 6654)
+++ trunk/SKNavigationWindow.h 2010-07-26 12:58:34 UTC (rev 6655)
@@ -48,8 +48,7 @@
SKNavigationButton *closeButton;
NSSlider *zoomSlider;
}
-- (id)initWithPDFView:(SKPDFView *)pdfView hasSlider:(BOOL)hasSlider;
-- (void)moveToScreen:(NSScreen *)screen;
+- (id)initWithPDFView:(SKPDFView *)pdfView hasSlider:(BOOL)hasSlider
screen:(NSScreen *)screen;
- (void)handleScaleChangedNotification:(NSNotification *)notification;
@end
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2010-07-26 12:16:58 UTC (rev 6654)
+++ trunk/SKNavigationWindow.m 2010-07-26 12:58:34 UTC (rev 6655)
@@ -62,10 +62,9 @@
@implementation SKNavigationWindow
-- (id)initWithPDFView:(SKPDFView *)pdfView hasSlider:(BOOL)hasSlider {
- NSScreen *screen = [[pdfView window] screen];
+- (id)initWithPDFView:(SKPDFView *)pdfView hasSlider:(BOOL)hasSlider
screen:(NSScreen *)screen {
if (screen == nil)
- screen = [NSScreen mainScreen];
+ screen = [[pdfView window] screen] ?: [NSScreen mainScreen];
CGFloat width = 4 * BUTTON_WIDTH + 2 * SEP_WIDTH + 2 * BUTTON_MARGIN;
if (hasSlider)
width += SLIDER_WIDTH;
@@ -177,13 +176,6 @@
[super dealloc];
}
-- (void)moveToScreen:(NSScreen *)screen {
- NSRect winFrame = [self frame];
- winFrame.origin.x = NSMidX([screen frame]) - 0.5 * NSWidth(winFrame);
- winFrame.origin.y = NSMinY([screen frame]) + WINDOW_OFFSET;
- [self setFrame:winFrame display:NO];
-}
-
- (void)remove {
[[self parentWindow] removeChildWindow:self];
[super remove];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2010-07-26 12:16:58 UTC (rev 6654)
+++ trunk/SKPDFView.m 2010-07-26 12:58:34 UTC (rev 6655)
@@ -2423,9 +2423,7 @@
[[NSNotificationCenter defaultCenter] addObserver: self selector:
@selector(handleWindowWillCloseNotification:)
name:
NSWindowWillCloseNotification object: [self window]];
}
- navWindow = [[SKNavigationWindow alloc] initWithPDFView:self
hasSlider:interactionMode == SKFullScreenMode];
- [navWindow moveToScreen:screen];
- [navWindow setLevel:[[self window] level]];
+ navWindow = [[SKNavigationWindow alloc] initWithPDFView:self
hasSlider:interactionMode == SKFullScreenMode screen:screen];
[self doAutohide:YES];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://ad.doubleclick.net/clk;226879339;13503038;l?
http://clk.atdmt.com/CRS/go/247765532/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit