Revision: 13717
http://sourceforge.net/p/skim-app/code/13717
Author: hofman
Date: 2023-11-01 22:42:00 +0000 (Wed, 01 Nov 2023)
Log Message:
-----------
No need for displaysRightToLeft for safe accessor
Modified Paths:
--------------
trunk/SKMainToolbarController.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.h
trunk/SKPDFView.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2023-11-01 22:28:12 UTC (rev 13716)
+++ trunk/SKMainToolbarController.m 2023-11-01 22:42:00 UTC (rev 13717)
@@ -1189,7 +1189,7 @@
}
- (IBAction)changeDisplaysRTL:(id)sender {
- [mainController.pdfView setDisplaysRightToLeftAndRewind:NO ==
[mainController.pdfView displaysRightToLeft]];
+ [mainController.pdfView setDisplaysRTLAndRewind:NO ==
[mainController.pdfView displaysRTL]];
[mainController.pdfView setExtendedDisplayMode:[mainController.pdfView
displayMode] | kPDFDisplayTwoUp];
}
@@ -1358,7 +1358,7 @@
}
- (void)handleDisplaysRTLChangedNotification:(NSNotification *)notification {
- BOOL displaysRTL = [mainController.pdfView displaysRightToLeft];
+ BOOL displaysRTL = [mainController.pdfView displaysRTL];
[displaysRTLButton setSelected:displaysRTL forSegment:0];
}
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2023-11-01 22:28:12 UTC (rev 13716)
+++ trunk/SKMainWindowController.m 2023-11-01 22:42:00 UTC (rev 13717)
@@ -671,7 +671,7 @@
if ((number = [setup objectForKey:DISPLAYDIRECTION_KEY]))
[pdfView setDisplaysHorizontally:[number boolValue]];
if ((number = [setup objectForKey:DISPLAYSRTL_KEY]))
- [pdfView setDisplaysRightToLeft:[number boolValue]];
+ [pdfView setDisplaysRTL:[number boolValue]];
if ((number = [setup objectForKey:DISPLAYBOX_KEY]))
[pdfView setDisplayBox:[number integerValue]];
}
@@ -686,7 +686,7 @@
[setup setObject:[NSNumber numberWithBool:[pdfView autoScales]]
forKey:AUTOSCALES_KEY];
[setup setObject:[NSNumber numberWithInteger:[pdfView displayMode]]
forKey:DISPLAYMODE_KEY];
[setup setObject:[NSNumber numberWithInteger:[pdfView
displaysHorizontally] ? 1 : 0] forKey:DISPLAYDIRECTION_KEY];
- [setup setObject:[NSNumber numberWithBool:[pdfView displaysRightToLeft]]
forKey:DISPLAYSRTL_KEY];
+ [setup setObject:[NSNumber numberWithBool:[pdfView displaysRTL]]
forKey:DISPLAYSRTL_KEY];
return setup;
}
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2023-11-01 22:28:12 UTC (rev
13716)
+++ trunk/SKMainWindowController_Actions.m 2023-11-01 22:42:00 UTC (rev
13717)
@@ -299,7 +299,7 @@
}
- (IBAction)toggleDisplaysRTL:(id)sender {
- [pdfView setDisplaysRightToLeftAndRewind:[pdfView displaysRightToLeft] ==
NO];
+ [pdfView setDisplaysRTLAndRewind:[pdfView displaysRTL] == NO];
[pdfView setExtendedDisplayMode:[pdfView displayMode] | kPDFDisplayTwoUp];
}
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2023-11-01 22:28:12 UTC (rev 13716)
+++ trunk/SKMainWindowController_UI.m 2023-11-01 22:42:00 UTC (rev 13717)
@@ -1708,7 +1708,7 @@
[menuItem setState:[pdfView displaysHorizontally] == (BOOL)[menuItem
tag] ? NSOnState : NSOffState];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && [pdfView
displayMode] == kPDFDisplaySinglePageContinuous;
} else if (action == @selector(toggleDisplaysRTL:)) {
- [menuItem setState:[pdfView displaysRightToLeft] ? NSOnState :
NSOffState];
+ [menuItem setState:[pdfView displaysRTL] ? NSOnState : NSOffState];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(toggleDisplaysAsBook:)) {
[menuItem setState:[pdfView displaysAsBook] ? NSOnState : NSOffState];
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2023-11-01 22:28:12 UTC (rev 13716)
+++ trunk/SKPDFView.h 2023-11-01 22:42:00 UTC (rev 13717)
@@ -175,7 +175,6 @@
@property (nonatomic) PDFDisplayMode extendedDisplayMode;
@property (nonatomic) BOOL displaysHorizontally;
-@property (nonatomic) BOOL displaysRightToLeft;
@property (nonatomic) SKToolMode toolMode;
@property (nonatomic) SKNoteType annotationMode;
@property (nonatomic) SKTemporaryToolMode temporaryToolMode;
@@ -216,7 +215,7 @@
- (void)setDisplayModeAndRewind:(PDFDisplayMode)mode;
- (void)setExtendedDisplayModeAndRewind:(PDFDisplayMode)mode;
- (void)setDisplaysHorizontallyAndRewind:(BOOL)flag;
-- (void)setDisplaysRightToLeftAndRewind:(BOOL)flag;
+- (void)setDisplaysRTLAndRewind:(BOOL)flag;
- (void)setDisplayBoxAndRewind:(PDFDisplayBox)box;
- (void)setDisplaysAsBookAndRewind:(BOOL)asBook;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2023-11-01 22:28:12 UTC (rev 13716)
+++ trunk/SKPDFView.m 2023-11-01 22:42:00 UTC (rev 13717)
@@ -251,7 +251,7 @@
@implementation SKPDFView
@synthesize toolMode, annotationMode, temporaryToolMode, interactionMode,
currentAnnotation, readingBar, pacerSpeed, transitionController,
typeSelectHelper, syncDot, zooming;
-@dynamic extendedDisplayMode, displaysHorizontally, displaysRightToLeft,
hideNotes, canSelectNote, hasReadingBar, hasPacer, currentSelectionPage,
currentSelectionRect, currentMagnification, needsRewind, editing;
+@dynamic extendedDisplayMode, displaysHorizontally, hideNotes, canSelectNote,
hasReadingBar, hasPacer, currentSelectionPage, currentSelectionRect,
currentMagnification, needsRewind, editing;
+ (void)initialize {
SKINITIALIZE;
@@ -830,14 +830,10 @@
}
}
-- (BOOL)displaysRightToLeft {
- return [self displaysRTL];
-}
-
-- (void)setDisplaysRightToLeft:(BOOL)flag {
+- (void)setDisplaysRTL:(BOOL)flag {
if (flag != [self displaysRTL]) {
PDFPage *page = [self currentPage];
- [self setDisplaysRTL:flag];
+ [super setDisplaysRTL:flag];
// on 10.15 this does not relayout the view...
[self layoutDocumentView];
if (page && [page isEqual:[self currentPage]] == NO)
@@ -848,11 +844,11 @@
}
}
-- (void)setDisplaysRightToLeftAndRewind:(BOOL)flag {
- if (flag != [self displaysRightToLeft]) {
+- (void)setDisplaysRTLAndRewind:(BOOL)flag {
+ if (flag != [self displaysRTL]) {
if ([self displayMode] != kPDFDisplaySinglePage)
[self setNeedsRewind:YES];
- [self setDisplaysRightToLeft:flag];
+ [self setDisplaysRTL:flag];
}
}
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
