Revision: 6502
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6502&view=rev
Author:   hofman
Date:     2010-04-29 23:34:09 +0000 (Thu, 29 Apr 2010)

Log Message:
-----------
use separate method to remove side windows to avoid exception when hiding the 
app

Modified Paths:
--------------
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_UI.m
    trunk/SKSideWindow.h
    trunk/SKSideWindow.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-04-29 17:24:37 UTC (rev 6501)
+++ trunk/SKMainWindowController.m      2010-04-29 23:34:09 UTC (rev 6502)
@@ -1214,7 +1214,7 @@
 
 - (void)hideLeftSideWindow {
     if ([[leftSideController.view window] isEqual:leftSideWindow]) {
-        [leftSideWindow orderOut:self];
+        [leftSideWindow remove];
         
         if ([[leftSideWindow firstResponder] 
isDescendantOf:leftSideController.view])
             [leftSideWindow makeFirstResponder:nil];
@@ -1236,7 +1236,7 @@
 
 - (void)hideRightSideWindow {
     if ([[rightSideController.view window] isEqual:rightSideWindow]) {
-        [rightSideWindow orderOut:self];
+        [rightSideWindow remove];
         
         if ([[rightSideWindow firstResponder] 
isDescendantOf:rightSideController.view])
             [rightSideWindow makeFirstResponder:nil];

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2010-04-29 17:24:37 UTC (rev 6501)
+++ trunk/SKMainWindowController_UI.m   2010-04-29 23:34:09 UTC (rev 6502)
@@ -253,11 +253,11 @@
         [[self window] setFrame:[screen frame] display:NO];
         if ([self isFullScreen]) {
             if ([[leftSideWindow screen] isEqual:screen] == NO) {
-                [leftSideWindow orderOut:self];
+                [leftSideWindow remove];
                 [leftSideWindow attachToWindow:[self window] onScreen:screen];
             }
             if ([[rightSideWindow screen] isEqual:screen] == NO) {
-                [rightSideWindow orderOut:self];
+                [rightSideWindow remove];
                 [rightSideWindow attachToWindow:[self window] onScreen:screen];
             }
         }
@@ -273,9 +273,9 @@
         if (NSEqualRects(screenFrame, [[self window] frame]) == NO) {
             [[self window] setFrame:screenFrame display:NO];
             if ([self isFullScreen]) {
-                [leftSideWindow orderOut:self];
+                [leftSideWindow remove];
                 [leftSideWindow attachToWindow:[self window] onScreen:screen];
-                [rightSideWindow orderOut:self];
+                [rightSideWindow remove];
                 [rightSideWindow attachToWindow:[self window] onScreen:screen];
             }
             [pdfView layoutDocumentView];

Modified: trunk/SKSideWindow.h
===================================================================
--- trunk/SKSideWindow.h        2010-04-29 17:24:37 UTC (rev 6501)
+++ trunk/SKSideWindow.h        2010-04-29 23:34:09 UTC (rev 6502)
@@ -68,6 +68,7 @@
 - (void)slideOut;
 - (void)expand;
 - (void)collapse;
+- (void)remove;
 - (void)resizeWithEvent:(NSEvent *)theEvent;
 
 @end

Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m        2010-04-29 17:24:37 UTC (rev 6501)
+++ trunk/SKSideWindow.m        2010-04-29 23:34:09 UTC (rev 6502)
@@ -165,9 +165,9 @@
     [window addChildWindow:self ordered:NSWindowAbove];
 }
 
-- (void)orderOut:(id)sender {
+- (void)remove {
     [[self parentWindow] removeChildWindow:self];
-    [super orderOut:sender];
+    [self orderOut:nil];
 }
 
 - (void)animateToWidth:(CGFloat)width {


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to