hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hide icon after initialization before close is useless

Browse Source
This commit is contained in:
rustdesk 2022-04-29 10:40:00 +08:00
parent 69b3f6660a
commit 8df1e42977
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/ui/macos.rs
View File

@ -42,9 +42,7 @@ impl DelegateState {
} }
} }
lazy_static::lazy_static! { static mut FIRST_TIME: bool = true;
static ref START_TM: std::sync::Mutex<std::time::Instant> = std::sync::Mutex::new(std::time::Instant::now());
}
impl AppHandler for Rc<Host> { impl AppHandler for Rc<Host> {
fn command(&mut self, cmd: u32) { fn command(&mut self, cmd: u32) {
@ -55,12 +53,11 @@ impl AppHandler for Rc<Host> {
let _ = self.call_function("awake", &make_args![]); let _ = self.call_function("awake", &make_args![]);
let _ = self.call_function("showSettings", &make_args![]); let _ = self.call_function("showSettings", &make_args![]);
} else if cmd == AWAKE { } else if cmd == AWAKE {
if START_TM.lock().unwrap().elapsed().as_millis() < 1000 { unsafe {
hbb_common::log::debug!( if std::env::args().nth(1) == Some("--server".to_owned()) && FIRST_TIME {
"First click on docker icon {:?}", FIRST_TIME = false;
START_TM.lock().unwrap().elapsed() return;
); }
return;
} }
let _ = self.call_function("awake", &make_args![]); let _ = self.call_function("awake", &make_args![]);
} }
@ -69,7 +66,6 @@ impl AppHandler for Rc<Host> {
// https://github.com/xi-editor/druid/blob/master/druid-shell/src/platform/mac/application.rs // https://github.com/xi-editor/druid/blob/master/druid-shell/src/platform/mac/application.rs
unsafe fn set_delegate(handler: Option<Box<dyn AppHandler>>) { unsafe fn set_delegate(handler: Option<Box<dyn AppHandler>>) {
*START_TM.lock().unwrap() = std::time::Instant::now();
let mut decl = let mut decl =
ClassDecl::new("AppDelegate", class!(NSObject)).expect("App Delegate definition failed"); ClassDecl::new("AppDelegate", class!(NSObject)).expect("App Delegate definition failed");
decl.add_ivar::<*mut c_void>(APP_HANDLER_IVAR); decl.add_ivar::<*mut c_void>(APP_HANDLER_IVAR);
@ -136,37 +132,22 @@ extern "C" fn application_should_handle_open_untitled_file(
YES YES
} }
extern "C" fn application_should_handle_reopen( extern "C" fn application_should_handle_reopen(_this: &mut Object, _: Sel, _sender: id) -> BOOL {
_this: &mut Object,
_: Sel,
_sender: id,
) -> BOOL {
hbb_common::log::debug!("reopen"); hbb_common::log::debug!("reopen");
YES YES
} }
extern "C" fn application_did_become_active ( extern "C" fn application_did_become_active(_this: &mut Object, _: Sel, _sender: id) -> BOOL {
_this: &mut Object,
_: Sel,
_sender: id,
) -> BOOL {
hbb_common::log::debug!("active"); hbb_common::log::debug!("active");
YES YES
} }
extern "C" fn application_did_become_unhide ( extern "C" fn application_did_become_unhide(_this: &mut Object, _: Sel, _sender: id) -> BOOL {
_this: &mut Object,
_: Sel,
_sender: id,
) -> BOOL {
hbb_common::log::debug!("unhide"); hbb_common::log::debug!("unhide");
YES YES
} }
extern "C" fn application_will_terminate(_this: &mut Object, _: Sel, _sender: id) -> BOOL { extern "C" fn application_will_terminate(_this: &mut Object, _: Sel, _sender: id) -> BOOL {
if std::env::args().len() == 1 || std::env::args().nth(1) == Some("--server".to_owned()) {
hide_dock();
}
YES YES
} }