From 42fae19c78d9b501a47a2da6196d1c318fd6ca35 Mon Sep 17 00:00:00 2001 From: don Date: Wed, 25 Dec 2024 23:49:00 +0100 Subject: [PATCH] fix windows bug --- src-tauri/src/service/window.rs | 28 ++++++++----------- .../pages/app/clipboard/text-clipboard.tsx | 2 +- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src-tauri/src/service/window.rs b/src-tauri/src/service/window.rs index 244347f5..1ca97009 100644 --- a/src-tauri/src/service/window.rs +++ b/src-tauri/src/service/window.rs @@ -18,23 +18,20 @@ use tauri_plugin_positioner::{Position, WindowExt}; /// App pub fn init_window() { - tauri::async_runtime::spawn(async { - let size = calculate_logical_size(MAIN_WINDOW_X, MAIN_WINDOW_Y).await; + #[cfg(any(windows, target_os = "macos"))] + { get_main_window() - .set_size(size) - .expect("Failed to set window size"); - - #[cfg(any(windows, target_os = "macos"))] - { - let _ = get_main_window().set_decorations(false); - let _ = get_main_window().set_shadow(true); - } + .set_decorations(false) + .expect("Failed to set decorations"); + get_main_window() + .set_shadow(false) + .expect("Failed to set shadow"); + } - #[cfg(debug_assertions)] - { - get_main_window().open_devtools(); - } - }); + #[cfg(debug_assertions)] + { + get_main_window().open_devtools(); + } } pub fn toggle_main_window() { @@ -72,7 +69,6 @@ pub fn toggle_main_window() { ) .expect("Failed to emit change tab event"); get_main_window().show().expect("Failed to show window"); - register_hotkeys(true); get_main_window() .emit( diff --git a/src/components/pages/app/clipboard/text-clipboard.tsx b/src/components/pages/app/clipboard/text-clipboard.tsx index 7bf4fe5c..bd35e011 100644 --- a/src/components/pages/app/clipboard/text-clipboard.tsx +++ b/src/components/pages/app/clipboard/text-clipboard.tsx @@ -79,7 +79,7 @@ export const TextClipboard: Component = (props) => {
-

{data}

+

{data}