[Skim-app-commit] SF.net SVN: skim-app:[14225] trunk/SKMainWindowController_Actions.m

[hofman--- via Skim-app-commit]

Revision: 14225
          http://sourceforge.net/p/skim-app/code/14225
Author:   hofman
Date:     2024-04-20 16:13:04 +0000 (Sat, 20 Apr 2024)
Log Message:
-----------
reorganize ancelOperation:, this can be called twice when the side window is 
shown

Modified Paths:
--------------
    trunk/SKMainWindowController_Actions.m

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m      2024-04-19 14:52:11 UTC (rev 
14224)
+++ trunk/SKMainWindowController_Actions.m      2024-04-20 16:13:04 UTC (rev 
14225)
@@ -1233,19 +1233,17 @@
 
 - (void)cancelOperation:(id)sender {
     // passed on from SKSideWindow or SKFullScreenWindow
-    if ([self hasOverview]) {
+    if ([self interactionMode] == SKPresentationMode) {
+        if ([self leftSidePaneIsOpen])
+            [self toggleLeftSidePane:sender];
+        else if ([self hasOverview])
+            [self hideOverviewAnimating:YES];
+        else
+            [self exitPresentation];
+    } else if ([self hasOverview]) {
         [self hideOverviewAnimating:YES];
-    } else if ([self interactionMode] != SKNormalMode) {
-        if (sender == [self window]) {
-            if ([self interactionMode] == SKPresentationMode && [self 
leftSidePaneIsOpen])
-                [self toggleLeftSidePane:sender];
-            else if ([self canExitFullscreen])
-                [self exitFullscreen];
-            else if ([self canExitPresentation])
-                [self exitPresentation];
-        } else if (sender == sideWindow) {
-            [self toggleLeftSidePane:sender];
-        }
+    } else if ([self canExitFullscreen]) {
+        [self exitFullscreen];
     }
 }
 

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit