Revision: 15921
http://sourceforge.net/p/skim-app/code/15921
Author: hofman
Date: 2025-12-25 17:46:26 +0000 (Thu, 25 Dec 2025)
Log Message:
-----------
no need for displaysHorizontally cover method
Modified Paths:
--------------
trunk/SKMainToolbarController.m
trunk/SKMainWindowController_Actions.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.h
trunk/SKPDFView.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-12-25 17:33:30 UTC (rev 15920)
+++ trunk/SKMainToolbarController.m 2025-12-25 17:46:26 UTC (rev 15921)
@@ -1236,7 +1236,7 @@
- (IBAction)changeDisplaySinglePages:(id)sender {
PDFDisplayMode displayMode = ([mainController.pdfView displayMode] &
~kPDFDisplayTwoUp) | [sender selectedTag];
- if ([mainController.pdfView displaysHorizontally] && displayMode ==
kPDFDisplaySinglePageContinuous)
+ if ([mainController.pdfView displayDirection] ==
kPDFDisplayDirectionHorizontal && displayMode ==
kPDFDisplaySinglePageContinuous)
displayMode = kPDFDisplayHorizontalContinuous;
[mainController.pdfView setExtendedDisplayModeAndRewind:displayMode];
}
@@ -1243,7 +1243,7 @@
- (IBAction)changeDisplayContinuous:(id)sender {
PDFDisplayMode displayMode = ([mainController.pdfView displayMode] &
~kPDFDisplaySinglePageContinuous) | [sender selectedTag];
- if ([mainController.pdfView displaysHorizontally] && displayMode ==
kPDFDisplaySinglePageContinuous)
+ if ([mainController.pdfView displayDirection] ==
kPDFDisplayDirectionHorizontal && displayMode ==
kPDFDisplaySinglePageContinuous)
displayMode = kPDFDisplayHorizontalContinuous;
[mainController.pdfView setExtendedDisplayModeAndRewind:displayMode];
}
@@ -1254,8 +1254,8 @@
}
- (IBAction)changeDisplayDirection:(id)sender {
- BOOL horizontally = [sender selectedTag] == 1;
- [mainController.pdfView setDisplaysHorizontallyAndRewind:horizontally];
+ PDFDisplayDirection direction = [sender selectedTag];
+ [mainController.pdfView setDisplayDirectionAndRewind:direction];
}
- (IBAction)changeDisplaysRTL:(id)sender {
@@ -1458,13 +1458,13 @@
PDFDisplayMode displayMode = [mainController.pdfView displayMode];
[singleTwoUpButton selectSegmentWithTag:displayMode & kPDFDisplayTwoUp];
[continuousButton selectSegmentWithTag:displayMode &
kPDFDisplaySinglePageContinuous];
- if ([mainController.pdfView displaysHorizontally] && displayMode ==
kPDFDisplaySinglePageContinuous && [displayModeButton segmentCount] > 4)
+ if ([mainController.pdfView displayDirection] ==
kPDFDisplayDirectionHorizontal && displayMode ==
kPDFDisplaySinglePageContinuous && [displayModeButton segmentCount] > 4)
displayMode = kPDFDisplayHorizontalContinuous;
[displayModeButton selectSegmentWithTag:displayMode];
}
- (void)handleDisplayDirectionChangedNotification:(NSNotification
*)notification {
- NSInteger direction = [mainController.pdfView displaysHorizontally] ? 1 :
0;
+ NSInteger direction = [mainController.pdfView displayDirection] ==
kPDFDisplayDirectionHorizontal ? 1 : 0;
[displayDirectionButton selectSegmentWithTag:direction];
PDFDisplayMode displayMode = [mainController.pdfView displayMode];
if (direction == 1 && displayMode == kPDFDisplaySinglePageContinuous &&
[displayModeButton segmentCount] > 4)
@@ -1534,7 +1534,7 @@
[nc addObserver:self
selector:@selector(handleDisplayModeChangedNotification:)
name:PDFViewDisplayModeChangedNotification
object:mainController.pdfView];
[nc addObserver:self
selector:@selector(handleDisplayDirectionChangedNotification:)
-
name:SKPDFViewDisplaysHorizontallyChangedNotification
object:mainController.pdfView];
+ name:SKPDFViewDisplayDirectionChangedNotification
object:mainController.pdfView];
[nc addObserver:self
selector:@selector(handleDisplaysRTLChangedNotification:)
name:SKPDFViewDisplaysRTLChangedNotification
object:mainController.pdfView];
[nc addObserver:self
selector:@selector(handleDisplayBoxChangedNotification:)
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2025-12-25 17:33:30 UTC (rev
15920)
+++ trunk/SKMainWindowController_Actions.m 2025-12-25 17:46:26 UTC (rev
15921)
@@ -292,7 +292,7 @@
- (IBAction)changeDisplaySinglePages:(id)sender {
PDFDisplayMode displayMode = ([pdfView displayMode] & ~kPDFDisplayTwoUp) |
[sender tag];
- if ([pdfView displaysHorizontally] && displayMode ==
kPDFDisplaySinglePageContinuous)
+ if ([pdfView displayDirection] == kPDFDisplayDirectionHorizontal &&
displayMode == kPDFDisplaySinglePageContinuous)
displayMode = kPDFDisplayHorizontalContinuous;
[pdfView setExtendedDisplayModeAndRewind:displayMode];
}
@@ -299,7 +299,7 @@
- (IBAction)changeDisplayContinuous:(id)sender {
PDFDisplayMode displayMode = ([pdfView displayMode] &
~kPDFDisplaySinglePageContinuous) | [sender tag];
- if ([pdfView displaysHorizontally] && displayMode ==
kPDFDisplaySinglePageContinuous)
+ if ([pdfView displayDirection] == kPDFDisplayDirectionHorizontal &&
displayMode == kPDFDisplaySinglePageContinuous)
displayMode = kPDFDisplayHorizontalContinuous;
[pdfView setExtendedDisplayModeAndRewind:displayMode];
}
@@ -309,7 +309,7 @@
}
- (IBAction)changeDisplayDirection:(id)sender {
- [pdfView setDisplaysHorizontallyAndRewind:[sender tag]];
+ [pdfView setDisplayDirectionAndRewind:[sender tag]];
}
- (IBAction)toggleDisplaysRTL:(id)sender {
@@ -885,7 +885,7 @@
}
PDFDisplayMode displayMode = [[self pdfView] displayMode];
- BOOL horizontal = [[self pdfView] displaysHorizontally] && displayMode ==
kPDFDisplaySinglePageContinuous;
+ BOOL horizontal = [[self pdfView] displayDirection] ==
kPDFDisplayDirectionHorizontal && displayMode ==
kPDFDisplaySinglePageContinuous;
CGFloat scaleFactor = [[self pdfView] scaleFactor];
BOOL autoScales = [[self pdfView] autoScales];
BOOL isSingleRow;
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2025-12-25 17:33:30 UTC (rev 15920)
+++ trunk/SKMainWindowController_UI.m 2025-12-25 17:46:26 UTC (rev 15921)
@@ -1816,7 +1816,7 @@
[menuItem setState: [pdfView extendedDisplayMode] == [menuItem tag] ?
NSControlStateValueOn : NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(changeDisplayDirection:)) {
- [menuItem setState:[pdfView displaysHorizontally] == (BOOL)[menuItem
tag] ? NSControlStateValueOn : NSControlStateValueOff];
+ [menuItem setState:[pdfView displayDirection] == [menuItem tag] ?
NSControlStateValueOn : NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && [pdfView
displayMode] == kPDFDisplaySinglePageContinuous;
} else if (action == @selector(toggleDisplaysRTL:)) {
[menuItem setState:[pdfView displaysRTL] ? NSControlStateValueOn :
NSControlStateValueOff];
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2025-12-25 17:33:30 UTC (rev 15920)
+++ trunk/SKPDFView.h 2025-12-25 17:46:26 UTC (rev 15921)
@@ -46,7 +46,7 @@
extern NSNotificationName const SKPDFViewDisplaysAsBookChangedNotification;
extern NSNotificationName const SKPDFViewDisplaysPageBreaksChangedNotification;
-extern NSNotificationName const
SKPDFViewDisplaysHorizontallyChangedNotification;
+extern NSNotificationName const SKPDFViewDisplayDirectionChangedNotification;
extern NSNotificationName const SKPDFViewDisplaysRTLChangedNotification;
extern NSNotificationName const SKPDFViewAutoScalesChangedNotification;
extern NSNotificationName const SKPDFViewToolModeChangedNotification;
@@ -181,7 +181,6 @@
}
@property (nonatomic) PDFDisplayMode extendedDisplayMode;
-@property (nonatomic) BOOL displaysHorizontally;
@property (nonatomic) SKToolMode toolMode;
@property (nonatomic) SKNoteType annotationMode;
@property (nonatomic) SKTemporaryToolMode temporaryToolMode;
@@ -218,7 +217,7 @@
- (void)setDisplayModeAndRewind:(PDFDisplayMode)mode;
- (void)setExtendedDisplayModeAndRewind:(PDFDisplayMode)mode;
-- (void)setDisplaysHorizontallyAndRewind:(BOOL)flag;
+- (void)setDisplayDirectionAndRewind:(PDFDisplayDirection)displayDirection;
- (void)setDisplaysRTLAndRewind:(BOOL)flag;
- (void)setDisplayBoxAndRewind:(PDFDisplayBox)box;
- (void)setDisplaysAsBookAndRewind:(BOOL)asBook;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-12-25 17:33:30 UTC (rev 15920)
+++ trunk/SKPDFView.m 2025-12-25 17:46:26 UTC (rev 15921)
@@ -107,7 +107,7 @@
NSNotificationName const SKPDFViewDisplaysAsBookChangedNotification =
@"SKPDFViewDisplaysAsBookChangedNotification";
NSNotificationName const SKPDFViewDisplaysPageBreaksChangedNotification =
@"SKPDFViewDisplaysPageBreaksChangedNotification";
-NSNotificationName const SKPDFViewDisplaysHorizontallyChangedNotification =
@"SKPDFViewDisplaysHorizontallyChangedNotification";
+NSNotificationName const SKPDFViewDisplayDirectionChangedNotification =
@"SKPDFViewDisplayDirectionChangedNotification";
NSNotificationName const SKPDFViewDisplaysRTLChangedNotification =
@"SKPDFViewDisplaysRTLChangedNotification";
NSNotificationName const SKPDFViewAutoScalesChangedNotification =
@"SKPDFViewAutoScalesChangedNotification";
NSNotificationName const SKPDFViewToolModeChangedNotification =
@"SKPDFViewToolModeChangedNotification";
@@ -243,7 +243,7 @@
@implementation SKPDFView
@synthesize toolMode, annotationMode, temporaryToolMode, currentAnnotation,
readingBar, pacerSpeed, typeSelectHelper, syncDot, hideNotes, zooming;
-@dynamic extendedDisplayMode, displaysHorizontally, displaySettings,
canSelectNote, hasReadingBar, hasPacer, selectToolPage, selectToolRect,
magnifyToolMagnification, needsRewind, editing, delegate;
+@dynamic extendedDisplayMode, displaySettings, canSelectNote, hasReadingBar,
hasPacer, selectToolPage, selectToolRect, magnifyToolMagnification,
needsRewind, editing, delegate;
+ (void)initialize {
SKINITIALIZE;
@@ -696,7 +696,7 @@
}
- (void)setDisplayMode:(PDFDisplayMode)mode {
- if (mode != [self displayMode] || (mode == kPDFDisplaySinglePageContinuous
&& [self displaysHorizontally])) {
+ if (mode != [self displayMode] || (mode == kPDFDisplaySinglePageContinuous
&& [self displayDirection] == kPDFDisplayDirectionHorizontal)) {
[super setDisplayMode:mode];
}
}
@@ -711,7 +711,7 @@
- (PDFDisplayMode)extendedDisplayMode {
PDFDisplayMode displayMode = [self displayMode];
- if (displayMode == kPDFDisplaySinglePageContinuous && [self
displaysHorizontally])
+ if (displayMode == kPDFDisplaySinglePageContinuous && [self
displayDirection] == kPDFDisplayDirectionHorizontal)
return kPDFDisplayHorizontalContinuous;
return displayMode;
}
@@ -718,13 +718,13 @@
- (void)setExtendedDisplayMode:(PDFDisplayMode)mode {
if (mode != [self extendedDisplayMode]) {
- BOOL horizontal = NO;
+ PDFDisplayDirection direction = kPDFDisplayDirectionVertical;
if (mode == kPDFDisplayHorizontalContinuous) {
mode = kPDFDisplaySinglePageContinuous;
- horizontal = YES;
+ direction = kPDFDisplayDirectionHorizontal;
}
[super setDisplayMode:mode];
- [self setDisplaysHorizontally:horizontal];
+ [self setDisplayDirection:direction];
}
}
@@ -736,21 +736,17 @@
}
}
-- (BOOL)displaysHorizontally {
- return [self displayDirection] == kPDFDisplayDirectionHorizontal;
-}
-
-- (void)setDisplaysHorizontally:(BOOL)flag {
- if (flag != ([self displayDirection] == kPDFDisplayDirectionHorizontal)) {
- [self setDisplayDirection:flag ? kPDFDisplayDirectionHorizontal :
kPDFDisplayDirectionVertical];
- [[NSNotificationCenter defaultCenter]
postNotificationName:SKPDFViewDisplaysHorizontallyChangedNotification
object:self];
+- (void)setDisplayDirection:(PDFDisplayDirection)displayDirection {
+ if (displayDirection != [self displayDirection]) {
+ [super setDisplayDirection:displayDirection];
+ [[NSNotificationCenter defaultCenter]
postNotificationName:SKPDFViewDisplayDirectionChangedNotification object:self];
}
}
-- (void)setDisplaysHorizontallyAndRewind:(BOOL)flag {
- if (flag != [self displaysHorizontally]) {
+- (void)setDisplayDirectionAndRewind:(PDFDisplayDirection)displayDirection {
+ if (displayDirection != [self displayDirection]) {
[self setNeedsRewind:YES];
- [self setDisplaysHorizontally:flag];
+ [self setDisplayDirection:displayDirection];
}
}
@@ -915,7 +911,7 @@
SCALEFACTOR_KEY: [NSNumber numberWithDouble:[self
scaleFactor]],
AUTOSCALES_KEY: [NSNumber numberWithBool:[self
autoScales]],
DISPLAYMODE_KEY: [NSNumber numberWithInteger:[self
displayMode]],
- DISPLAYDIRECTION_KEY: [NSNumber numberWithInteger:[self
displaysHorizontally] ? 1 : 0],
+ DISPLAYDIRECTION_KEY: [NSNumber numberWithInteger:[self
displayDirection] == kPDFDisplayDirectionHorizontal ? 1 : 0],
DISPLAYSRTL_KEY: [NSNumber numberWithBool:[self
displaysRTL]]};
}
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
