[Skim-app-commit] SF.net SVN: skim-app:[12075] trunk

[hofman--- via Skim-app-commit]

Revision: 12075
          http://sourceforge.net/p/skim-app/code/12075
Author:   hofman
Date:     2020-11-30 22:29:47 +0000 (Mon, 30 Nov 2020)
Log Message:
-----------
Background color of fullscreen window is always black

Modified Paths:
--------------
    trunk/SKFullScreenWindow.h
    trunk/SKFullScreenWindow.m
    trunk/SKMainWindowController_FullScreen.m

Modified: trunk/SKFullScreenWindow.h
===================================================================
--- trunk/SKFullScreenWindow.h  2020-11-30 15:30:19 UTC (rev 12074)
+++ trunk/SKFullScreenWindow.h  2020-11-30 22:29:47 UTC (rev 12075)
@@ -44,7 +44,7 @@
     BOOL isMain;
 }
 
-- (id)initWithScreen:(NSScreen *)screen backgroundColor:(NSColor 
*)backgroundColor level:(NSInteger)level isMain:(BOOL)flag;
+- (id)initWithScreen:(NSScreen *)screen level:(NSInteger)level 
isMain:(BOOL)flag;
 
 - (void)fadeOutBlocking:(BOOL)blocking;
 - (void)fadeInBlocking:(BOOL)blocking;

Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m  2020-11-30 15:30:19 UTC (rev 12074)
+++ trunk/SKFullScreenWindow.m  2020-11-30 22:29:47 UTC (rev 12075)
@@ -43,12 +43,12 @@
 
 @implementation SKFullScreenWindow
 
-- (id)initWithScreen:(NSScreen *)screen backgroundColor:(NSColor 
*)backgroundColor level:(NSInteger)level isMain:(BOOL)flag {
+- (id)initWithScreen:(NSScreen *)screen level:(NSInteger)level 
isMain:(BOOL)flag {
     NSRect screenFrame = [(screen ?: [NSScreen mainScreen]) frame];
     self = [self initWithContentRect:screenFrame 
styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
     if (self) {
         isMain = flag;
-        [self setBackgroundColor:backgroundColor];
+        [self setBackgroundColor:[NSColor blackColor]];
         [self setLevel:level];
         [self setReleasedWhenClosed:NO];
         [self setDisplaysWhenScreenProfileChanges:isMain];
@@ -65,21 +65,6 @@
 
 - (BOOL)canBecomeMainWindow { return isMain; }
 
-- (void)orderFront:(id)sender {
-    [self setAlphaValue:1.0];
-    [super orderFront:sender];
-}
-
-- (void)makeKeyAndOrderFront:(id)sender {
-    [self setAlphaValue:1.0];
-    [super makeKeyAndOrderFront:sender];
-}
-
-- (void)orderOut:(id)sender {
-    [super orderOut:sender];
-    [self setAlphaValue:1.0];
-}
-
 - (void)fadeOutBlocking:(BOOL)blocking {
     __block BOOL wait = blocking;
     [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context){
@@ -97,7 +82,7 @@
 - (void)fadeInBlocking:(BOOL)blocking {
     __block BOOL wait = blocking;
     [self setAlphaValue:0.0];
-    [super orderFront:nil];
+    [self orderFront:nil];
     [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context){
         [context setDuration:DURATION];
         [[self animator] setAlphaValue:1.0];

Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m   2020-11-30 15:30:19 UTC (rev 
12074)
+++ trunk/SKMainWindowController_FullScreen.m   2020-11-30 22:29:47 UTC (rev 
12075)
@@ -259,7 +259,7 @@
     if ([[mainWindow firstResponder] isDescendantOf:pdfSplitView])
         [mainWindow makeFirstResponder:nil];
     
-    SKFullScreenWindow *fullScreenWindow = [[SKFullScreenWindow alloc] 
initWithScreen:screen ?: [mainWindow screen] backgroundColor:[NSColor 
blackColor] level:NSPopUpMenuWindowLevel isMain:YES];
+    SKFullScreenWindow *fullScreenWindow = [[SKFullScreenWindow alloc] 
initWithScreen:screen ?: [mainWindow screen] level:NSPopUpMenuWindowLevel 
isMain:YES];
     
     [mainWindow setDelegate:nil];
     [self setWindow:fullScreenWindow];
@@ -277,7 +277,7 @@
 
 - (void)fadeInFullScreenView:(NSView *)view {
     SKFullScreenWindow *fullScreenWindow = (SKFullScreenWindow *)[self window];
-    SKFullScreenWindow *fadeWindow = [[[SKFullScreenWindow alloc] 
initWithScreen:[fullScreenWindow screen] backgroundColor:[fullScreenWindow 
backgroundColor] level:[fullScreenWindow level] isMain:NO] autorelease];
+    SKFullScreenWindow *fadeWindow = [[[SKFullScreenWindow alloc] 
initWithScreen:[fullScreenWindow screen] level:[fullScreenWindow level] 
isMain:NO] autorelease];
     
     [fadeWindow setFrame:[fullScreenWindow frame] display:NO];
     [fadeWindow orderWindow:NSWindowAbove relativeTo:[fullScreenWindow 
windowNumber]];
@@ -294,7 +294,7 @@
 
 - (void)fadeOutFullScreenView:(NSView *)view {
     SKFullScreenWindow *fullScreenWindow = (SKFullScreenWindow *)[self window];
-    SKFullScreenWindow *fadeWindow = [[SKFullScreenWindow alloc] 
initWithScreen:[fullScreenWindow screen] backgroundColor:[fullScreenWindow 
backgroundColor] level:[fullScreenWindow level] isMain:NO];
+    SKFullScreenWindow *fadeWindow = [[SKFullScreenWindow alloc] 
initWithScreen:[fullScreenWindow screen] level:[fullScreenWindow level] 
isMain:NO];
     
     [fadeWindow setFrame:[fullScreenWindow frame] display:NO];
     [fadeWindow setAlphaValue:0.0];

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