Revision: 13381
http://sourceforge.net/p/skim-app/code/13381
Author: hofman
Date: 2023-03-16 17:48:26 +0000 (Thu, 16 Mar 2023)
Log Message:
-----------
remove now unused full screen window methods and variables
Modified Paths:
--------------
trunk/SKFullScreenWindow.h
trunk/SKFullScreenWindow.m
trunk/SKMainWindowController_FullScreen.m
Modified: trunk/SKFullScreenWindow.h
===================================================================
--- trunk/SKFullScreenWindow.h 2023-03-16 17:37:25 UTC (rev 13380)
+++ trunk/SKFullScreenWindow.h 2023-03-16 17:48:26 UTC (rev 13381)
@@ -40,15 +40,10 @@
#import "SKMainWindow.h"
-@interface SKFullScreenWindow : SKMainWindow <NSAnimationDelegate> {
- BOOL isMain;
-}
+@interface SKFullScreenWindow : SKMainWindow <NSAnimationDelegate>
-- (id)initWithScreen:(NSScreen *)screen level:(NSInteger)level
isMain:(BOOL)flag;
+- (id)initWithScreen:(NSScreen *)screen;
-- (void)fadeOutBlocking:(BOOL)blocking;
-- (void)fadeInBlocking:(BOOL)blocking;
-
@end
Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m 2023-03-16 17:37:25 UTC (rev 13380)
+++ trunk/SKFullScreenWindow.m 2023-03-16 17:48:26 UTC (rev 13381)
@@ -44,17 +44,16 @@
@implementation SKFullScreenWindow
-- (id)initWithScreen:(NSScreen *)screen level:(NSInteger)level
isMain:(BOOL)flag {
+- (id)initWithScreen:(NSScreen *)screen {
NSRect screenFrame = [(screen ?: [NSScreen mainScreen]) frame];
self = [self initWithContentRect:screenFrame
styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO];
if (self) {
- isMain = flag;
[self setBackgroundColor:[NSColor blackColor]];
- [self setLevel:level];
+ [self setLevel:NSPopUpMenuWindowLevel];
[self setReleasedWhenClosed:NO];
- [self setDisplaysWhenScreenProfileChanges:isMain];
- [self setAcceptsMouseMovedEvents:isMain];
- [self setExcludedFromWindowsMenu:isMain == NO];
+ [self setDisplaysWhenScreenProfileChanges:YES];
+ [self setAcceptsMouseMovedEvents:YES];
+ [self setExcludedFromWindowsMenu:NO];
// appartently this is needed for secondary screens
[self setFrame:screenFrame display:NO];
[self setAnimationBehavior:NSWindowAnimationBehaviorNone];
@@ -62,46 +61,10 @@
return self;
}
-- (BOOL)canBecomeKeyWindow { return isMain; }
+- (BOOL)canBecomeKeyWindow { return YES; }
-- (BOOL)canBecomeMainWindow { return isMain; }
+- (BOOL)canBecomeMainWindow { return YES; }
-- (void)fadeOutBlocking:(BOOL)blocking {
- if ([NSView shouldShowFadeAnimation]) {
- __block BOOL wait = blocking;
- [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context){
- [context setDuration:DURATION];
- [[self animator] setAlphaValue:0.0];
- } completionHandler:^{
- [self orderOut:nil];
- [self setAlphaValue:1.0];
- wait = NO;
- }];
- NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
- while (wait && [runLoop runMode:NSDefaultRunLoopMode
beforeDate:[NSDate distantFuture]]);
- } else {
- [self orderOut:nil];
- }
-}
-
-- (void)fadeInBlocking:(BOOL)blocking {
- if ([NSView shouldShowFadeAnimation]) {
- __block BOOL wait = blocking;
- [self setAlphaValue:0.0];
- [self orderFront:nil];
- [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context){
- [context setDuration:DURATION];
- [[self animator] setAlphaValue:1.0];
- } completionHandler:^{
- wait = NO;
- }];
- NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
- while (wait && [runLoop runMode:NSDefaultRunLoopMode
beforeDate:[NSDate distantFuture]]);
- } else {
- [self orderFront:nil];
- }
-}
-
- (void)sendEvent:(NSEvent *)theEvent {
if ([theEvent type] == NSEventTypeRightMouseDown || ([theEvent type] ==
NSEventTypeLeftMouseDown && ([theEvent modifierFlags] &
NSEventModifierFlagControl))) {
if ([[self windowController]
respondsToSelector:@selector(handleRightMouseDown:)] && [[self
windowController] handleRightMouseDown:theEvent])
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2023-03-16 17:37:25 UTC (rev
13380)
+++ trunk/SKMainWindowController_FullScreen.m 2023-03-16 17:48:26 UTC (rev
13381)
@@ -304,7 +304,7 @@
if ([[mainWindow firstResponder] isDescendantOf:pdfSplitView])
[mainWindow makeFirstResponder:nil];
- NSWindow *fullScreenWindow = [[SKFullScreenWindow alloc]
initWithScreen:screen ?: [mainWindow screen] level:NSPopUpMenuWindowLevel
isMain:YES];
+ NSWindow *fullScreenWindow = [[SKFullScreenWindow alloc]
initWithScreen:screen ?: [mainWindow screen]];
[mainWindow setDelegate:nil];
[self setWindow:fullScreenWindow];
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
