Revision: 12074
http://sourceforge.net/p/skim-app/code/12074
Author: hofman
Date: 2020-11-30 15:30:19 +0000 (Mon, 30 Nov 2020)
Log Message:
-----------
Remove convenience methods to fade in/out
Modified Paths:
--------------
trunk/SKFullScreenWindow.h
trunk/SKFullScreenWindow.m
trunk/SKMainWindowController_FullScreen.m
Modified: trunk/SKFullScreenWindow.h
===================================================================
--- trunk/SKFullScreenWindow.h 2020-11-30 15:27:34 UTC (rev 12073)
+++ trunk/SKFullScreenWindow.h 2020-11-30 15:30:19 UTC (rev 12074)
@@ -46,10 +46,8 @@
- (id)initWithScreen:(NSScreen *)screen backgroundColor:(NSColor
*)backgroundColor level:(NSInteger)level isMain:(BOOL)flag;
-- (void)fadeOutBlocking;
-- (void)fadeOut;
-- (void)fadeInBlocking;
-- (void)fadeIn;
+- (void)fadeOutBlocking:(BOOL)blocking;
+- (void)fadeInBlocking:(BOOL)blocking;
@end
Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m 2020-11-30 15:27:34 UTC (rev 12073)
+++ trunk/SKFullScreenWindow.m 2020-11-30 15:30:19 UTC (rev 12074)
@@ -108,22 +108,6 @@
while (wait && [runLoop runMode:NSDefaultRunLoopMode beforeDate:[NSDate
distantFuture]]);
}
-- (void)fadeOutBlocking {
- [self fadeOutBlocking:YES];
-}
-
-- (void)fadeOut {
- [self fadeOutBlocking:NO];
-}
-
-- (void)fadeInBlocking {
- [self fadeInBlocking:YES];
-}
-
-- (void)fadeIn {
- [self fadeInBlocking:NO];
-}
-
- (void)sendEvent:(NSEvent *)theEvent {
if ([theEvent type] == NSRightMouseDown || ([theEvent type] ==
NSLeftMouseDown && ([theEvent modifierFlags] & NSControlKeyMask))) {
if ([[self windowController]
respondsToSelector:@selector(handleRightMouseDown:)] && [[self
windowController] handleRightMouseDown:theEvent])
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2020-11-30 15:27:34 UTC (rev
12073)
+++ trunk/SKMainWindowController_FullScreen.m 2020-11-30 15:30:19 UTC (rev
12074)
@@ -263,7 +263,7 @@
[mainWindow setDelegate:nil];
[self setWindow:fullScreenWindow];
- [fullScreenWindow fadeInBlocking];
+ [fullScreenWindow fadeInBlocking:YES];
[fullScreenWindow makeKeyWindow];
[NSApp updatePresentationOptionsForWindow:fullScreenWindow];
[mainWindow setAnimationBehavior:NSWindowAnimationBehaviorNone];
@@ -289,7 +289,7 @@
[fullScreenWindow makeFirstResponder:pdfView];
[fullScreenWindow recalculateKeyViewLoop];
[fullScreenWindow setDelegate:self];
- [fadeWindow fadeOut];
+ [fadeWindow fadeOutBlocking:NO];
}
- (void)fadeOutFullScreenView:(NSView *)view {
@@ -299,7 +299,7 @@
[fadeWindow setFrame:[fullScreenWindow frame] display:NO];
[fadeWindow setAlphaValue:0.0];
[fadeWindow orderWindow:NSWindowAbove relativeTo:[fullScreenWindow
windowNumber]];
- [fadeWindow fadeInBlocking];
+ [fadeWindow fadeInBlocking:YES];
while ([[fullScreenWindow childWindows] count] > 0) {
NSWindow *childWindow = [[fullScreenWindow childWindows] lastObject];
@@ -345,7 +345,7 @@
[NSApp updatePresentationOptionsForWindow:mainWindow];
[mainWindow setAnimationBehavior:NSWindowAnimationBehaviorDefault];
[NSApp removeWindowsItem:fullScreenWindow];
- [fullScreenWindow fadeOut];
+ [fullScreenWindow fadeOutBlocking:NO];
if ([mainWindow alphaValue] < 1.0)
[[mainWindow animator] setAlphaValue:1.0];
}
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
