Move window outline submenu to WindowOutliningController

jslegendre · Jan 23, 2023 · 3d07d28 · 3d07d28
1 parent 5a8a487
commit 3d07d28
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/AfloatX.xcodeproj/project.pbxproj b/AfloatX.xcodeproj/project.pbxproj
@@ -312,7 +312,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.4.2;
+				CURRENT_PROJECT_VERSION = 1.5;
 				DEPLOYMENT_LOCATION = YES;
 				DEVELOPMENT_TEAM = "";
 				DSTROOT = /;
@@ -324,8 +324,8 @@
 				INSTALL_PATH = "/Library/Application Support/MacEnhance/Plugins";
 				LLVM_LTO = YES;
 				MACH_O_TYPE = mh_dylib;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.4.2;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MARKETING_VERSION = 1.5;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.jslegendre.AfloatX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -347,7 +347,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.4.2;
+				CURRENT_PROJECT_VERSION = 1.5;
 				DEPLOYMENT_LOCATION = YES;
 				DEVELOPMENT_TEAM = "";
 				DSTROOT = /;
@@ -360,8 +360,8 @@
 				INSTALL_PATH = "/Library/Application Support/MacEnhance/Plugins";
 				LLVM_LTO = YES;
 				MACH_O_TYPE = mh_dylib;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.4.2;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MARKETING_VERSION = 1.5;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.jslegendre.AfloatX;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/...codeproj/project.xcworkspace/xcuserdata/jeremy.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/jeremy.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/AfloatX/AfloatX.m b/AfloatX/AfloatX.m
@@ -29,7 +29,6 @@
 NSMenuItem *invertColorItem;
 NSMenuItem *clickPassthroughItem;
 NSMenuItem *windowOutlineItem;
-NSMenu *windowOutlineSubmenu;
 NSArray *afloatXItems;
 CIFilter* colorInvertFilter;
 
@@ -146,6 +145,7 @@ - (void)showTransparencySheet {
 }
 
 + (void)load {
+    NSLog(@"AfloatX loaded");
     if([NSBundle mainBundle] == NULL)
         return;
 
@@ -169,8 +169,6 @@ + (void)load {
 
     windowOutlineItem = [NSMenuItem new];
     windowOutlineItem.title = @"Outline Window";
-    windowOutlineSubmenu = [NSMenu new];
-    windowOutlineItem.submenu = windowOutlineSubmenu;
 
     floatItem = [[NSMenuItem alloc] initWithTitle:@"Float Window" action:@selector(toggleFloatMainWindow) keyEquivalent:@""];
     [floatItem setTarget:plugin];
@@ -254,16 +252,13 @@ - (CFArrayRef)_createDockMenu:(BOOL)enabled {
     }
 
     /* Create a new WindowOutliningController per window */
-    [windowOutlineSubmenu removeAllItems];
     if (!objc_getAssociatedObject(window, "outlineController")) {
         WindowOutliningController *outlineController = [WindowOutliningController new];
-        for(NSMenuItem *item in [outlineController colorItems])
-            [windowOutlineSubmenu addItem:item];
+        windowOutlineItem.submenu = outlineController.menu;
         objc_setAssociatedObject(window, "outlineController", outlineController, OBJC_ASSOCIATION_RETAIN);
     } else {
         WindowOutliningController *outlineController = objc_getAssociatedObject(window, "outlineController");
-        for(NSMenuItem *item in [outlineController colorItems])
-            [windowOutlineSubmenu addItem:item];
+        windowOutlineItem.submenu = outlineController.menu;
     }
 
     if ([objc_getAssociatedObject(window, "isColorInverted") boolValue]) {

diff --git a/AfloatX/WindowOutliningController.h b/AfloatX/WindowOutliningController.h
@@ -11,6 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface WindowOutliningController : NSObject
+@property (strong) NSMenuItem *accentColorItem;
 @property (strong) NSMenuItem *whiteItem;
 @property (strong) NSMenuItem *blackItem;
 @property (strong) NSMenuItem *redItem;
@@ -20,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong) NSMenuItem *orangeItem;
 @property (strong) NSMenuItem *purpleItem;
 @property (strong) NSArray *colorItems;
+@property (strong) NSMenu *menu;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/AfloatX/WindowOutliningController.m b/AfloatX/WindowOutliningController.m
@@ -182,6 +182,10 @@ - (instancetype)init {
                                                             self.purpleItem,
                                                             nil];
     }
+
+    self.menu = [NSMenu new];
+    self.menu.itemArray = self.colorItems;
+
     return self;
 }
 @end