fix focus window implementation on macos

Author: ekrenzin

src/macos/window_manager.mm

@@ -93,35 +93,33 @@ MMRect getWindowRect(const WindowHandle windowHandle) {
   return "";
 }
 
-BOOL focusWindow(NSWindow *window) {
-    // if (window) {
-    //     // Restore the window if it's minimized
-    //     if ([window isMiniaturized]) {
-    //         [window deminiaturize:nil];
-    //     }
-        
-    //     // Try to set the window to the foreground
-    //     [window makeKeyAndOrderFront:nil];
-        
-    //     return YES;
-    // }
-    return NO;
+bool focusWindow(const WindowHandle windowHandle) {
+    CGWindowListOption listOptions = kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements;
+    CFArrayRef windowList = CGWindowListCopyWindowInfo(listOptions, kCGNullWindowID);
+
+    for (NSDictionary *info in (NSArray *)windowList) {
+        NSNumber *ownerPid = info[(id)kCGWindowOwnerPID];
+        NSNumber *windowNumber = info[(id)kCGWindowNumber];
+
+        if ([windowNumber intValue] == windowHandle) {
+            NSRunningApplication *app = [NSRunningApplication runningApplicationWithProcessIdentifier:[ownerPid intValue]];
+            [app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
+            CFRelease(windowList);
+            return true;
+        }
+    }
+
+    if (windowList) {
+        CFRelease(windowList);
+    }
+    return false;
 }
 
-BOOL resizeWindow(NSWindow *window, MMRect rect) {
-    if (window) {
-        NSRect frame;
-        
-        //size
-        frame.size.width = rect.size.width;
-        frame.size.height = rect.size.height;
 
-        //origin
-        frame.origin.x = rect.origin.x;
-        frame.origin.y = rect.origin.y;
+bool resizeWindow(const WindowHandle windowHandle, MMRect rect) {
+  if (windowHandle < 0) {
+    return false;
+  }
 
-        [window setFrame:frame display:YES animate:NO];
-        return YES;
-    }
-    return NO;
+  return true;
 }

src/main.cc

@@ -654,35 +654,35 @@ Napi::Boolean _focusWindow(const Napi::CallbackInfo &info) {
     return Napi::Boolean::New(env, result);
 }
 
-Napi::Value _resizeWindow(const Napi::CallbackInfo& info) {
-    Napi::Env env = info.Env();
-
-    if (info.Length() < 2 || !info[0].IsNumber() || !info[1].IsObject()) {
-        Napi::TypeError::New(env, "Invalid arguments. Expected handle (number) and rect (object).").ThrowAsJavaScriptException();
-        return Napi::Boolean::New(env, false);
-    }
-
-    int64_t handle = info[0].As<Napi::Number>().Int64Value();
-    Napi::Object rectObj = info[1].As<Napi::Object>();
-
-    int64_t x = 0;
-    int64_t y = 0;
-    int64_t width = 0;
-    int64_t height = 0;
-
-    if (rectObj.Has("x"))
-        x = rectObj.Get("x").As<Napi::Number>().Int64Value();
-    if (rectObj.Has("y"))
-        y = rectObj.Get("y").As<Napi::Number>().Int64Value();
-    if (rectObj.Has("width"))
-        width = rectObj.Get("width").As<Napi::Number>().Int64Value();
-    if (rectObj.Has("height"))
-        height = rectObj.Get("height").As<Napi::Number>().Int64Value();
-
-    MMRect rect = MMRectMake(x, y, width, height);
-    resizeWindow(handle, rect);
-
-    return Napi::Boolean::New(env, true);
+Napi::Boolean _resizeWindow(const Napi::CallbackInfo& info) {
+    // Napi::Env env = info.Env();
+
+    // if (info.Length() < 2 || !info[0].IsNumber() || !info[1].IsObject()) {
+    //     Napi::TypeError::New(env, "Invalid arguments. Expected handle (number) and rect (object).").ThrowAsJavaScriptException();
+    //     return Napi::Boolean::New(env, false);
+    // }
+
+    // int64_t handle = info[0].As<Napi::Number>().Int64Value();
+    // Napi::Object rectObj = info[1].As<Napi::Object>();
+
+    // int64_t x = 0;
+    // int64_t y = 0;
+    // int64_t width = 0;
+    // int64_t height = 0;
+
+    // if (rectObj.Has("x"))
+    //     x = rectObj.Get("x").As<Napi::Number>().Int64Value();
+    // if (rectObj.Has("y"))
+    //     y = rectObj.Get("y").As<Napi::Number>().Int64Value();
+    // if (rectObj.Has("width"))
+    //     width = rectObj.Get("width").As<Napi::Number>().Int64Value();
+    // if (rectObj.Has("height"))
+    //     height = rectObj.Get("height").As<Napi::Number>().Int64Value();
+
+    // MMRect rect = MMRectMake(x, y, width, height);
+    // resizeWindow(handle, rect);
+
+    // return Napi::Boolean::New(env, true);
 }
 
 

src/win32/window_manager.cc

@@ -52,7 +52,7 @@ std::string getWindowTitle(const WindowHandle windowHandle) {
     return "";
 }
 
-bool focusWindow(const WindowHandle windowHandle) {
+std::bool focusWindow(const WindowHandle windowHandle) {
     HWND hWnd = reinterpret_cast<HWND>(windowHandle);
     if (IsWindow(hWnd)) {
         // Restore the window if it's minimized
@@ -66,7 +66,7 @@ bool focusWindow(const WindowHandle windowHandle) {
     return false;
 }
 
-bool resizeWindow(const WindowHandle windowHandle, const MMRect& rect) {
+std::bool resizeWindow(const WindowHandle windowHandle, const MMRect& rect) {
     HWND hWnd = reinterpret_cast<HWND>(windowHandle);
     if (IsWindow(hWnd)) {
         //size