kevin/lmvpn_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 移除showAndActivate避免误显示SystrayMonitor窗口
Release / build-macos (push) Canceled after 0s
Details
Release / build-windows (push) Canceled after 0s
Details
Release / release (push) Canceled after 0s
Details

Browse Source 
回退绕过GLFW遍历所有NSWindow的失败方案,恢复使用activateApp()+
showDockIcon()+window.Show()。保留真正生效的修复:正确selector
applicationShouldHandleReopen:hasVisibleWindows: + SetOnStarted延迟注册
This commit is contained in:
kevin
2026-07-09 00:49:53 +08:00
parent 96b1a8839c
commit 15af9ef72c
5 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ui/dock_darwin.go
-25
View File
@@ -37,29 +37,6 @@ static void cmActivateApp(void) {
((void (*)(id, SEL, BOOL))objc_msgSend)(app, sel_getUid("activateIgnoringOtherApps:"), YES);
}
// cmShowAndActivate switches to regular activation policy (dock icon
// visible), activates the app, and makes every NSWindow key+front.
// This bypasses GLFW's glfwShowWindow (which uses orderFront:nil and
// is unreliable during NSApplication activation-policy transitions).
static void cmShowAndActivate(void) {
Class cls = objc_getClass("NSApplication");
id app = ((id (*)(Class, SEL))objc_msgSend)(cls, sel_getUid("sharedApplication"));
// Regular activation policy (dock icon visible).
((void (*)(id, SEL, long))objc_msgSend)(app, sel_getUid("setActivationPolicy:"), 0);
// Bring app to foreground.
((void (*)(id, SEL, BOOL))objc_msgSend)(app, sel_getUid("activateIgnoringOtherApps:"), YES);
// Make every window key and visible. NSArray* windows = [app windows];
id windows = ((id (*)(id, SEL))objc_msgSend)(app, sel_getUid("windows"));
// NSUInteger count = [windows count];
unsigned long count = ((unsigned long (*)(id, SEL))objc_msgSend)(windows, sel_getUid("count"));
for (unsigned long i = 0; i < count; i++) {
// id w = [windows objectAtIndex:i];
id w = ((id (*)(id, SEL, unsigned long))objc_msgSend)(windows, sel_getUid("objectAtIndex:"), i);
// [w makeKeyAndOrderFront:nil];
((void (*)(id, SEL, id))objc_msgSend)(w, sel_getUid("makeKeyAndOrderFront:"), nil);
}
}
// cmRegisterReopenHandler adds applicationShouldHandleReopen:
// hasVisibleWindows: to the GLFWApplicationDelegate class at runtime
// (class_addMethod). This lets us detect when macOS re-opens the
@@ -81,6 +58,4 @@ func hideDockIcon() { C.setDockIconVisible(0) }
func activateApp() { C.cmActivateApp() }
func showAndActivate() { C.cmShowAndActivate() }
func registerReopenHandler() { C.cmRegisterReopenHandler() }