[Skim-app-commit] SF.net SVN: skim-app:[13546] trunk

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

Revision: 13546
          http://sourceforge.net/p/skim-app/code/13546
Author:   hofman
Date:     2023-07-29 15:37:25 +0000 (Sat, 29 Jul 2023)
Log Message:
-----------
set display mode to two up or two up continuous when changing book mode or RTL

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

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m     2023-07-28 09:18:11 UTC (rev 13545)
+++ trunk/SKMainToolbarController.m     2023-07-29 15:37:25 UTC (rev 13546)
@@ -1038,9 +1038,9 @@
     } else if ([identifier 
isEqualToString:SKDocumentToolbarDisplayDirectionItemIdentifier]) {
         return RUNNING_AFTER(10_12) && [mainController.pdfView.document 
isLocked] == NO && [mainController hasOverview] == NO && 
[mainController.pdfView displayMode] == kPDFDisplaySinglePageContinuous;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarDisplaysRTLItemIdentifier]) {
-        return RUNNING_AFTER(10_12) && [mainController.pdfView.document 
isLocked] == NO && [mainController hasOverview] == NO && 
([mainController.pdfView displayMode] & kPDFDisplayTwoUp) != 0;
+        return RUNNING_AFTER(10_12) && [mainController.pdfView.document 
isLocked] == NO && [mainController hasOverview] == NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarBookModeItemIdentifier]) {
-        return [mainController.pdfView.document isLocked] == NO && 
[mainController hasOverview] == NO && ([mainController.pdfView displayMode] & 
kPDFDisplayTwoUp) != 0;
+        return [mainController.pdfView.document isLocked] == NO && 
[mainController hasOverview] == NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarToolModeItemIdentifier]) {
         return [mainController hasOverview] == NO;
     } else if ([identifier 
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier 
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
@@ -1240,10 +1240,12 @@
 
 - (IBAction)changeDisplaysRTL:(id)sender {
     [mainController.pdfView setDisplaysRightToLeftAndRewind:NO == 
[mainController.pdfView displaysRightToLeft]];
+    [mainController.pdfView setExtendedDisplayMode:[mainController.pdfView 
displayMode] | kPDFDisplayTwoUp];
 }
 
 - (IBAction)changeBookMode:(id)sender {
     [mainController.pdfView setDisplaysAsBookAndRewind:NO == 
[mainController.pdfView displaysAsBook]];
+    [mainController.pdfView setExtendedDisplayMode:[mainController.pdfView 
displayMode] | kPDFDisplayTwoUp];
 }
 
 - (IBAction)changePageBreaks:(id)sender {

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m      2023-07-28 09:18:11 UTC (rev 
13545)
+++ trunk/SKMainWindowController_Actions.m      2023-07-29 15:37:25 UTC (rev 
13546)
@@ -300,10 +300,12 @@
 
 - (IBAction)toggleDisplaysRTL:(id)sender {
     [pdfView setDisplaysRightToLeftAndRewind:[pdfView displaysRightToLeft] == 
NO];
+    [pdfView setExtendedDisplayMode:[pdfView displayMode] | kPDFDisplayTwoUp];
 }
 
 - (IBAction)toggleDisplaysAsBook:(id)sender {
     [pdfView setDisplaysAsBookAndRewind:[pdfView displaysAsBook] == NO];
+    [pdfView setExtendedDisplayMode:[pdfView displayMode] | kPDFDisplayTwoUp];
 }
 
 - (IBAction)toggleDisplayPageBreaks:(id)sender {

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2023-07-28 09:18:11 UTC (rev 13545)
+++ trunk/SKMainWindowController_UI.m   2023-07-29 15:37:25 UTC (rev 13546)
@@ -1692,10 +1692,10 @@
         return RUNNING_AFTER(10_12) && [self interactionMode] != 
SKPresentationMode && [self hasOverview] == NO && [[self pdfDocument] isLocked] 
== NO && [pdfView displayMode] == kPDFDisplaySinglePageContinuous;
     } else if (action == @selector(toggleDisplaysRTL:)) {
         [menuItem setState:[pdfView displaysRightToLeft] ? NSOnState : 
NSOffState];
-        return RUNNING_AFTER(10_12) && [self interactionMode] != 
SKPresentationMode && [self hasOverview] == NO && [[self pdfDocument] isLocked] 
== NO && ([pdfView displayMode] == kPDFDisplayTwoUp || [pdfView displayMode] == 
kPDFDisplayTwoUpContinuous);
+        return RUNNING_AFTER(10_12) && [self interactionMode] != 
SKPresentationMode && [self hasOverview] == NO && [[self pdfDocument] isLocked] 
== NO;
     } else if (action == @selector(toggleDisplaysAsBook:)) {
         [menuItem setState:[pdfView displaysAsBook] ? NSOnState : NSOffState];
-        return [self interactionMode] != SKPresentationMode && [self 
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && ([pdfView 
displayMode] == kPDFDisplayTwoUp || [pdfView displayMode] == 
kPDFDisplayTwoUpContinuous);
+        return [self interactionMode] != SKPresentationMode && [self 
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
     } else if (action == @selector(toggleDisplayPageBreaks:)) {
         [menuItem setState:[pdfView displaysPageBreaks] ? NSOnState : 
NSOffState];
         return [self interactionMode] != SKPresentationMode && [self 
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;

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