Revision: 12081
http://sourceforge.net/p/skim-app/code/12081
Author: hofman
Date: 2020-12-01 15:45:24 +0000 (Tue, 01 Dec 2020)
Log Message:
-----------
Set overview style when adding. Always go back to pdfview when exiting
presentation, also when there was an overview
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKMainWindowController_FullScreen.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2020-12-01 10:49:37 UTC (rev 12080)
+++ trunk/SKMainWindowController.h 2020-12-01 15:45:24 UTC (rev 12081)
@@ -295,7 +295,6 @@
- (void)showOverviewAnimating:(BOOL)animate;
- (void)hideOverviewAnimating:(BOOL)animate;
- (void)hideOverviewAnimating:(BOOL)animate completionHandler:(void
(^)(void))handler;
-- (void)setOverviewPresentationMode:(BOOL)flag;
- (void)displayTocViewAnimating:(BOOL)animate;
- (void)displayThumbnailViewAnimating:(BOOL)animate;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2020-12-01 10:49:37 UTC (rev 12080)
+++ trunk/SKMainWindowController.m 2020-12-01 15:45:24 UTC (rev 12081)
@@ -1574,7 +1574,6 @@
[overviewView setBackgroundColors:[NSArray arrayWithObjects:[NSColor
clearColor], nil]];
[scrollView setDrawsBackground:NO];
overviewContentView = [[NSVisualEffectView alloc] init];
- [overviewContentView setMaterial:RUNNING_BEFORE(10_11) ?
NSVisualEffectMaterialAppearanceBased : NSVisualEffectMaterialSidebar];
[overviewContentView setAutoresizingMask:NSViewWidthSizable |
NSViewHeightSizable];
[overviewContentView addSubview:scrollView];
[scrollView release];
@@ -1599,8 +1598,23 @@
[overviewContentView setFrame:[oldView frame]];
[overviewView scrollRectToVisible:[overviewView
frameForItemAtIndex:[[pdfView currentPage] pageIndex]]];
- if ([self interactionMode] == SKPresentationMode)
- [self setOverviewPresentationMode:YES];
+ if (RUNNING_BEFORE(10_14)) {
+ [overviewContentView setMaterial:isPresentation ?
NSVisualEffectMaterialDark : RUNNING_BEFORE(10_11) ?
NSVisualEffectMaterialAppearanceBased : NSVisualEffectMaterialSidebar];
+ NSBackgroundStyle style = isPresentation ? NSBackgroundStyleDark :
NSBackgroundStyleLight;
+ NSUInteger i, iMax = [[overviewView content] count];
+ for (i = 0; i < iMax; i++)
+ [(SKThumbnailItem *)[overviewView itemAtIndex:i]
setBackgroundStyle:style];
+ } else if (isPresentation) {
+ SKSetHasDarkAppearance(overviewContentView);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpartial-availability"
+ [overviewContentView
setMaterial:NSVisualEffectMaterialUnderPageBackground];
+#pragma clang diagnostic pop
+ } else {
+ SKSetHasDefaultAppearance(overviewContentView);
+ [overviewContentView setMaterial:NSVisualEffectMaterialSidebar];
+ }
+ [overviewView setSingleClickAction:isPresentation ?
@selector(hideOverview:) : NULL];
if (animate) {
BOOL hasLayer = [contentView wantsLayer] || [contentView layer] != nil;
@@ -1613,18 +1627,15 @@
}
completionHandler:^{
[touchBarController overviewChanged];
- [[self window] makeFirstResponder:overviewView];
if (hasLayer == NO)
[contentView setWantsLayer:NO];
- if (isPresentation)
- [NSCursor setHiddenUntilMouseMoves:NO];
}];
} else {
[contentView replaceSubview:oldView with:overviewContentView];
- [[self window] makeFirstResponder:overviewView];
- if (isPresentation)
- [NSCursor setHiddenUntilMouseMoves:NO];
}
+ [[self window] makeFirstResponder:overviewView];
+ if (isPresentation)
+ [NSCursor setHiddenUntilMouseMoves:NO];
[touchBarController overviewChanged];
}
@@ -1654,8 +1665,6 @@
completionHandler:^{
[touchBarController overviewChanged];
[[self window] makeFirstResponder:pdfView];
- if ([self interactionMode] == SKPresentationMode)
- [self setOverviewPresentationMode:NO];
if (hasLayer == NO)
[contentView setWantsLayer:NO];
if (handler)
@@ -1665,8 +1674,6 @@
[contentView replaceSubview:overviewContentView with:newView];
[touchBarController overviewChanged];
[[self window] makeFirstResponder:pdfView];
- if ([self interactionMode] == SKPresentationMode)
- [self setOverviewPresentationMode:NO];
if (handler)
handler();
}
@@ -1677,28 +1684,6 @@
[self hideOverviewAnimating:(BOOL)animate completionHandler:NULL];
}
-- (void)setOverviewPresentationMode:(BOOL)flag {
- if (overviewView == nil)
- return;
- if (RUNNING_BEFORE(10_14)) {
- [overviewContentView setMaterial:flag ? NSVisualEffectMaterialDark :
RUNNING_BEFORE(10_11) ? NSVisualEffectMaterialAppearanceBased :
NSVisualEffectMaterialSidebar];
- NSBackgroundStyle style = flag ? NSBackgroundStyleDark :
NSBackgroundStyleLight;
- NSUInteger i, iMax = [[overviewView content] count];
- for (i = 0; i < iMax; i++)
- [(SKThumbnailItem *)[overviewView itemAtIndex:i]
setBackgroundStyle:style];
- } else if (flag) {
- SKSetHasDarkAppearance(overviewContentView);
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
- [overviewContentView
setMaterial:NSVisualEffectMaterialUnderPageBackground];
-#pragma clang diagnostic pop
- } else {
- SKSetHasDefaultAppearance(overviewContentView);
- [overviewContentView setMaterial:NSVisualEffectMaterialSidebar];
- }
- [overviewView setSingleClickAction:flag ? @selector(hideOverview:) : NULL];
-}
-
#pragma mark Searching
- (void)displaySearchResultsForString:(NSString *)string {
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2020-12-01 10:49:37 UTC (rev
12080)
+++ trunk/SKMainWindowController_FullScreen.m 2020-12-01 15:45:24 UTC (rev
12081)
@@ -419,7 +419,6 @@
NSColor *backgroundColor = [PDFView defaultBackgroundColor];
PDFPage *page = [[self pdfView] currentPage];
- BOOL hasOverview = [self hasOverview];
mwcFlags.isSwitchingFullScreen = 1;
@@ -434,16 +433,8 @@
interactionMode = SKNormalMode;
// this should be done before exitPresentationMode to get a smooth
transition
- if (hasOverview) {
- [overviewContentView setFrame:[splitView frame]];
- [[splitView superview] replaceSubview:splitView
with:overviewContentView];
- [pdfView setFrame:[centerContentView bounds]];
- [centerContentView addSubview:pdfView];
- [self setOverviewPresentationMode:NO];
- } else {
- [pdfView setFrame:[pdfContentView bounds]];
- [pdfContentView addSubview:pdfView];
- }
+ [pdfView setFrame:[pdfContentView bounds]];
+ [pdfContentView addSubview:pdfView];
[pdfView setBackgroundColor:backgroundColor];
[secondaryPdfView setBackgroundColor:backgroundColor];
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
