Revision: 15301
http://sourceforge.net/p/skim-app/code/15301
Author: hofman
Date: 2025-05-26 17:00:40 +0000 (Mon, 26 May 2025)
Log Message:
-----------
only set mainWindow during presentation
Modified Paths:
--------------
trunk/MainWindow.xib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKMainWindowController_FullScreen.m
Modified: trunk/MainWindow.xib
===================================================================
--- trunk/MainWindow.xib 2025-05-26 16:42:54 UTC (rev 15300)
+++ trunk/MainWindow.xib 2025-05-26 17:00:40 UTC (rev 15301)
@@ -11,7 +11,6 @@
<outlet property="centerContentView" destination="1321"
id="1526"/>
<outlet property="findBarTopConstraint"
destination="Twe-rt-5Qm" id="9jp-xi-0gz"/>
<outlet property="leftSideContentView" destination="769"
id="774"/>
- <outlet property="mainWindow" destination="5" id="1554"/>
<outlet property="pdfContentView" destination="1315"
id="1527"/>
<outlet property="pdfSplitView" destination="1314" id="1318"/>
<outlet property="rightSideContentView" destination="770"
id="775"/>
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2025-05-26 16:42:54 UTC (rev 15300)
+++ trunk/SKMainWindowController.h 2025-05-26 17:00:40 UTC (rev 15301)
@@ -207,8 +207,6 @@
} mwcFlags;
}
-@property (nonatomic, nullable, strong) IBOutlet NSWindow *mainWindow;
-
@property (nonatomic, nullable, strong) IBOutlet SKSplitView *splitView;
@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*topConstraint;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2025-05-26 16:42:54 UTC (rev 15300)
+++ trunk/SKMainWindowController.m 2025-05-26 17:00:40 UTC (rev 15301)
@@ -218,7 +218,7 @@
@implementation SKMainWindowController
-@synthesize mainWindow, splitView, topConstraint, centerContentView,
pdfSplitView, pdfContentView, findBarTopConstraint, statusBar, pdfView,
secondaryPdfView, leftSideContentView, rightSideContentView,
presentationNotesDocument, presentationNotesOffset, notes, thumbnails,
snapshots, searchResults, groupedSearchResults, tags, rating, pageLabel,
interactionMode, placeholderPdfDocument;
+@synthesize splitView, topConstraint, centerContentView, pdfSplitView,
pdfContentView, findBarTopConstraint, statusBar, pdfView, secondaryPdfView,
leftSideContentView, rightSideContentView, presentationNotesDocument,
presentationNotesOffset, notes, thumbnails, snapshots, searchResults,
groupedSearchResults, tags, rating, pageLabel, interactionMode,
placeholderPdfDocument;
@dynamic pdfDocument, presentationUndoManager, selectedNotes, hasNotes,
widgetProperties, currentPage, leftSidePaneState, rightSidePaneState,
findPaneState, displaysFindPane, leftSidePaneIsOpen, rightSidePaneIsOpen,
searchString, hasNoteToolbar, hasOverview, notesMenu;
+ (BOOL)automaticallyNotifiesObserversOfPageLabel { return NO; }
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2025-05-26 16:42:54 UTC (rev
15300)
+++ trunk/SKMainWindowController_FullScreen.m 2025-05-26 17:00:40 UTC (rev
15301)
@@ -241,6 +241,8 @@
interactionMode = SKPresentationMode;
+ mainWindow = [self window];
+
NSScreen *screen = [mainWindow screen];
if ([self presentationNotesDocument] && [self presentationNotesDocument]
!= [self document]) {
NSArray *screens = [[[[self presentationNotesDocument] mainWindow]
screen] alternateScreens];
@@ -427,6 +429,8 @@
[presentationView setPage:nil];
[presentationView setAutoScales:NO];
+ mainWindow = nil;
+
if (presentationPreview) {
[[presentationPreview window]
setAnimationBehavior:NSWindowAnimationBehaviorNone];
[presentationPreview close];
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
