Merge branch 'master' of github.com:TermiT/Flycut

TermiT · Dec 22, 2020 · fe6b606 · fe6b606
2 parents 2d9b7d2 + 8d88100
commit fe6b606
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: TermiT
+custom: https://paypal.me/flycut
diff --git a/AppController.h b/AppController.h
@@ -22,7 +22,7 @@
 
 @class SGHotKey;
 
-@interface AppController : NSObject <NSMenuDelegate, NSApplicationDelegate, NSAlertDelegate, FlycutStoreDelegate, FlycutOperatorDelegate> {
+@interface AppController : NSObject <NSMenuDelegate, NSApplicationDelegate, NSAlertDelegate, FlycutStoreDelegate, FlycutOperatorDelegate, BezelWindowDelegate> {
     BezelWindow					*bezel;
 	SGHotKey					*mainHotKey;
 	IBOutlet SRRecorderControl	*mainRecorder;
@@ -97,6 +97,7 @@
 -(void) processBezelKeyDown:(NSEvent *)theEvent;
 -(void) processBezelMouseEvents:(NSEvent *)theEvent;
 -(void) metaKeysReleased;
+-(void) windowDidResignKey:(NSNotification *)notification;
 
 // Menu related
 -(void) updateMenu;

diff --git a/AppController.m b/AppController.m
@@ -758,6 +758,12 @@ - (void)metaKeysReleased
 	}
 }
 
+- (void)windowDidResignKey:(NSNotification *)notification {
+	if ( isBezelPinned ) {
+		[self hideApp];
+	}
+}
+
 -(void)fakeKey:(NSNumber*) keyCode withCommandFlag:(BOOL) setFlag
 	/*" +fakeKey synthesizes keyboard events. "*/
 {     
@@ -1059,8 +1065,8 @@ - (void) hideBezel
 
 -(void)hideApp
 {
-	[self hideBezel];
 	isBezelPinned = NO;
+	[self hideBezel];
 	[NSApp hide:self];
 }
 

diff --git a/UI/BezelWindow.h b/UI/BezelWindow.h
@@ -14,6 +14,13 @@
 #import "RoundRecBezierPath.h"
 #import "RoundRecTextField.h"
 
+@protocol BezelWindowDelegate <NSWindowDelegate>
+
+-(void)processBezelKeyDown:(NSEvent *)theEvent;
+-(void)processBezelMouseEvents:(NSEvent *)theEvent;
+-(void)metaKeysReleased;
+
+@end
 
 @interface BezelWindow : NSPanel {
 	// "n of n" text in bezel
@@ -33,7 +40,7 @@
 	RoundRecTextField	*textField;
 	RoundRecTextField	*charField;
 	NSImageView			*iconView;
-	id					delegate;
+	id<BezelWindowDelegate>	delegate;
     Boolean             color;
 }
 
@@ -57,7 +64,7 @@
 - (void)setDate:(NSString *)newDate;
 - (void)setSourceIcon:(NSImage *)newSourceIcon;
 
-- (id)delegate;
-- (void)setDelegate:(id)newDelegate;
+- (id<BezelWindowDelegate>)delegate;
+- (void)setDelegate:(id<BezelWindowDelegate>)newDelegate;
 
 @end
diff --git a/UI/BezelWindow.m b/UI/BezelWindow.m
@@ -365,12 +365,13 @@ - (void)flagsChanged:(NSEvent *)theEvent {
 	}
 }
 
-- (id)delegate {
+- (id<BezelWindowDelegate>)delegate {
     return delegate;
 }
 
-- (void)setDelegate:(id)newDelegate {
+- (void)setDelegate:(id<BezelWindowDelegate>)newDelegate {
     delegate = newDelegate;
+	super.delegate = newDelegate;
 }
 
 @end
diff --git a/readme.md b/readme.md
@@ -22,7 +22,7 @@ If you like Flycut, you can donate [here](https://paypal.me/flycut)
 Download from the App Store [here](http://itunes.apple.com/us/app/flycut-clipboard-manager/id442160987?mt=12)
 
 **DRM-Free:**
-Download latest DRM-Free version [here](https://github.com/MarkJerde/Flycut/releases/latest)
+Download latest DRM-Free version [here](https://github.com/TermiT/Flycut/releases)
 
 **iOS App Store:**
 Download from the App Store [here](https://itunes.apple.com/us/app/flycut/id1273639655?mt=8)