Revision: 6624
http://skim-app.svn.sourceforge.net/skim-app/?rev=6624&view=rev
Author: hofman
Date: 2010-07-17 10:58:52 +0000 (Sat, 17 Jul 2010)
Log Message:
-----------
was removing child window for wrong window
Modified Paths:
--------------
trunk/SKNavigationWindow.m
trunk/SKPDFView.m
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2010-07-16 15:32:00 UTC (rev 6623)
+++ trunk/SKNavigationWindow.m 2010-07-17 10:58:52 UTC (rev 6624)
@@ -184,6 +184,11 @@
[self setFrame:winFrame display:NO];
}
+- (void)remove {
+ [[self parentWindow] removeChildWindow:self];
+ [super remove];
+}
+
- (void)orderOut:(id)sender {
[[SKNavigationToolTipWindow sharedToolTipWindow] orderOut:nil];
[super orderOut:sender];
@@ -274,17 +279,13 @@
[self setLevel:[[view window] level]];
if ([self parentWindow] != [view window])
[[self parentWindow] removeChildWindow:self];
- if ([self parentWindow] == nil)
+ if ([self parentWindow] == nil)
[[view window] addChildWindow:self ordered:NSWindowAbove];
[self orderFront:self];
}
-- (void)remove {
+- (void)orderOut:(id)sender {
[[self parentWindow] removeChildWindow:self];
- [super remove];
-}
-
-- (void)orderOut:(id)sender {
[super orderOut:sender];
SKDESTROY(view);
}
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2010-07-16 15:32:00 UTC (rev 6623)
+++ trunk/SKPDFView.m 2010-07-17 10:58:52 UTC (rev 6624)
@@ -1175,7 +1175,8 @@
if ([navWindow isVisible] == NO) {
if (navigationMode == SKNavigationEverywhere) {
[navWindow fadeIn];
- [[self window] addChildWindow:navWindow ordered:NSWindowAbove];
+ if ([navWindow parentWindow] == nil)
+ [[self window] addChildWindow:navWindow ordered:NSWindowAbove];
} else if (navigationMode == SKNavigationBottom && [theEvent
locationInWindow].y < 3.0) {
[self showNavWindow:YES];
}
@@ -2455,7 +2456,8 @@
- (void)showNavWindowDelayed {
if ([navWindow isVisible] == NO && [[self window]
mouseLocationOutsideOfEventStream].y < 3.0) {
[navWindow fadeIn];
- [[self window] addChildWindow:navWindow ordered:NSWindowAbove];
+ if ([navWindow parentWindow] == nil)
+ [[self window] addChildWindow:navWindow ordered:NSWindowAbove];
}
}
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 Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit