Skip to content

An attempt to fix the "double click" bug on MacOS #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eriksvedang wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

An attempt to fix the "double click" bug on MacOS #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b693fb
WIP.
eriksvedang Jun 12, 2024
5ddfea5
Merge branch 'master' into erik
eriksvedang Jun 12, 2024
6030229
This actually seems to work..?
eriksvedang Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,3 +388,7 @@ where
native::ios::run(conf, f);
}
}

pub fn prevent_double_click_bug_on_macos() {
crate::native::apple::apple_util::prevent_double_click_bug_on_macos();
}
36 changes: 36 additions & 0 deletions src/native/apple/apple_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,3 +565,39 @@ pub extern "C" fn yes(_: &Object, _: Sel) -> BOOL {
pub extern "C" fn yes1(_: &Object, _: Sel, _: ObjcId) -> BOOL {
YES
}

static mut HACKED: bool = false;

pub fn define_app_delegate_class() -> *const Class {
let superclass = class!(NSObject);
let mut decl = ClassDecl::new("MyAppDelegate", superclass).unwrap();

unsafe {
decl.add_method(
sel!(applicationDidUpdate:),
application_did_update as extern "C" fn(&Object, Sel, ObjcId),
);
}

extern "C" fn application_did_update(_this: &Object, _: Sel, _: ObjcId) {
unsafe {
if !HACKED {
HACKED = true;
let current_application: ObjcId =
msg_send![class!(NSRunningApplication), currentApplication];
let _: BOOL = msg_send![current_application, activateWithOptions: nil];
}
}
}

return decl.register();
}

pub fn prevent_double_click_bug_on_macos() {
unsafe {
let app_delegate_class = define_app_delegate_class();
let app_delegate_instance: ObjcId = msg_send![app_delegate_class, new];
let ns_app: ObjcId = msg_send![class!(NSApplication), sharedApplication];
let () = msg_send![ns_app, setDelegate: app_delegate_instance];
}
}