Fix dock menu injection

Brand new dock menu injection logic. Is compatible with all apps (including Electron) and dock menu configurations.

Author: jslegendre

AfloatX.xcodeproj/project.pbxproj

@@ -307,7 +307,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.3.4;
+				CURRENT_PROJECT_VERSION = 1.3.5;
 				DEPLOYMENT_LOCATION = YES;
 				DEVELOPMENT_TEAM = 6LAE5ASX7M;
 				DSTROOT = /;
@@ -318,7 +318,7 @@
 				INSTALL_PATH = "/Library/Application Support/MacEnhance/Plugins";
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.3.4;
+				MARKETING_VERSION = 1.3.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.jslegendre.AfloatX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = bundle;
@@ -331,7 +331,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.3.4;
+				CURRENT_PROJECT_VERSION = 1.3.5;
 				DEPLOYMENT_LOCATION = YES;
 				DEVELOPMENT_TEAM = 6LAE5ASX7M;
 				DSTROOT = /;
@@ -342,7 +342,7 @@
 				INSTALL_PATH = "/Library/Application Support/MacEnhance/Plugins";
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.3.4;
+				MARKETING_VERSION = 1.3.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.jslegendre.AfloatX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = bundle;

AfloatX/AfloatX.m

@@ -211,59 +211,22 @@ + (void)load {
                                                     transparencyItem,
                                                     nil];
     [AfloatXSubmenu setItemArray:afloatXItems];
-
-    // Are we in an Electron app?
-    if(objc_lookUpClass("AtomApplicationDelegate")) {
-        dispatch_once(&injectMenuOnceToken, ^{ /* Use up token */ });
-        [AfloatXMenu addItem:AfloatXItem];
-    }
+    
+    [AfloatXMenu addItem:[NSMenuItem separatorItem]];
+    [AfloatXMenu addItem:AfloatXItem];
 }
 
 @end
 
-/*
- AtomApplicationDelegate is the application delegate class
- for all Electron apps. In order for AfloatX to work we must
- explicitly swizzle this class because the application delegate
- class gets subclassed/swizzled to this one after injection.
-*/
-ZKSwizzleInterface(AXAppDelegate, AtomApplicationDelegate, NSObject)
-@implementation AXAppDelegate
-- (NSMenu *)applicationDockMenu:(NSApplication *)sender {
-    NSMenu *originalMenu = ZKOrig(NSMenu*, sender);
-    if(originalMenu) {
-        [AfloatXMenu removeItem:AfloatXItem];
-        AfloatXMenu = originalMenu;
-        // Only add a separator if last item isn't already a separator
-        if (!AfloatXMenu.itemArray.lastObject.isSeparatorItem)
-            [AfloatXMenu addItem:[NSMenuItem separatorItem]];
-        [AfloatXMenu addItem:AfloatXItem];
-    }
-
-    return AfloatXMenu;
-}
-@end
-
 ZKSwizzleInterface(AXApplication, NSApplication, NSResponder)
 @implementation AXApplication
-- (CFArrayRef)_flattenMenu:(NSMenu *)dockMenu flatList:(NSArray *)flatList {
-
-    // Add AfloatX to the dock menu
-    dispatch_once(&injectMenuOnceToken, ^{
-        if (!dockMenu.itemArray.lastObject.isSeparatorItem)
-            [dockMenu addItem:[NSMenuItem separatorItem]];
-
-        [dockMenu addItem:AfloatXItem];
-    });
-
-    // Make any necessary changes to our menu before it is 'flattened'
+- (CFArrayRef)_createDockMenu:(BOOL)enabled {
     NSWindow *window = [AXWindowUtils windowToModify];
     if(!window) {
-        AfloatXItem.enabled = NO;
-        return ZKOrig(CFArrayRef, dockMenu, flatList);
+        return ZKOrig(CFArrayRef, enabled);
     }
 
-    AfloatXItem.enabled = YES;
+    // Make any necessary changes to our menu before it is 'flattened'
     if([[AfloatX sharedInstance] isWindowTransient:window]) {
         [transientItem setState:NSControlStateValueOn];
     } else {
@@ -311,7 +274,12 @@ - (CFArrayRef)_flattenMenu:(NSMenu *)dockMenu flatList:(NSArray *)flatList {
     } else {
         [invertColorItem setState:NSControlStateValueOff];
     }
-
-    return ZKOrig(CFArrayRef, dockMenu, flatList);
+    
+    CFArrayRef flatDockMenu = ZKOrig(CFArrayRef, enabled);
+    CFArrayRef flatAfloatXMenu = (__bridge CFArrayRef)(objc_msgSend(self, sel_getUid("_flattenMenu:flatList:"), AfloatXMenu, nil));
+    
+    NSMutableArray *combinedFlatMenus = (__bridge NSMutableArray *)flatDockMenu;
+    [combinedFlatMenus addObjectsFromArray:(__bridge NSArray *)flatAfloatXMenu];
+    return (__bridge CFArrayRef)combinedFlatMenus;
 }
 @end