From afc6d2b9ec66266665a02c2bd8ac827676b67787 Mon Sep 17 00:00:00 2001 From: m1911star Date: Sun, 6 Nov 2022 23:44:24 +0800 Subject: [PATCH 1/4] feat: make pake run on windows --- src-tauri/icons/icon.ico | Bin 0 -> 4286 bytes src-tauri/src/main.rs | 69 ++++++++++++++++++++++++++++++--------- 2 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 src-tauri/icons/icon.ico diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..5a1de882b2613c27ed8318858355ac85b7d86146 GIT binary patch literal 4286 zcmc&&OH7kN5dQVxSuUPAa`X)<1(X=P7%#?{7$Zgz1Z;t*2R--*5sfbri6$f*3=tDC zG59!0B$}9-7+(p&KwG3x3G#*jwG`TpGqaDsEq|e*HMH68{=2jD&3rSv|85Oq9ey)2 z4f-{*HX6nz!!WY2V3$#Vh58eHJPzA>k0Z};+o{+}u%_LiK&-qBvO)Nb*d%Aq3*vZ) zeU|gMogV*@M_Y(71XhQ@CeGRKpvR7U3%jXaJ?~5HC2XM&F{Gd9uZTB36E7jc=6Efg zpF#}G+%a`C52TZGjbbBsR{o1QXrCpnRlijq`?Exc$Z3hG^IULXa<24I?LL=_Tw&o_ z*rdh@BN~V0v}|t7n3N^{b$&A^>N$>gjZsqwp6b2eso58!PmP;3;*p$^#afLiJK0vT zu9Xdx8@1V??aFgXn4Z<@eWwgWs>`KB${c9mztK-~$LAL@hPA1?$) zeDJ%z0$gWzYFTXq?OJz8GJpgafqYmY%>aY1AF?v-I|C=bz&%H801f74?V?agcx z*%+-amA1QL7x-OYO^mmXIR=zp-s?vpyfDvWkw^r5cS>~Lr^LPDOvYg3*4@4a#u!U4bZGYr1lr5x;TFi#o z&W{>vtnDH6UMMoT$NZ;tKzkAGPif^q#$dR)R^!k8`~<@-H}$jM{hf0$l{{N+F6H^J zO9vq|JI$Ekz#Q+j%7D@5_5X=``Cg#C2KT+0FYOGe_CtCI2Ls@}b_DYz2iIJhxyL*d zdjY-=a8Dg-x~%clo;TO!6mduFHP!aPIs_1yMG}sbQfK-`zOYIP4C~u WhOyx){zX6~(SHQ#?pJuli2V-(@{2hD literal 0 HcmV?d00001 diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index af3ce31..c5c6edc 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -1,4 +1,17 @@ use tauri_utils::config::{Config, WindowConfig}; +#[cfg(macos)] +use wry::{ + application::{ + platform::macos::WindowBuilderExtMacOS, + } +}; + +#[cfg(windows)] +use wry::{ + application::{ + platform::windows::WindowBuilderExtWindows + } +}; fn main() -> wry::Result<()> { use wry::{ @@ -8,7 +21,6 @@ fn main() -> wry::Result<()> { event_loop::{ControlFlow, EventLoop}, keyboard::KeyCode, menu::{MenuBar as Menu, MenuItem, MenuItemAttributes, MenuType}, - platform::macos::WindowBuilderExtMacOS, window::{Fullscreen, Window, WindowBuilder}, }, webview::WebViewBuilder, @@ -46,21 +58,46 @@ fn main() -> wry::Result<()> { .. } = get_windows_config().unwrap_or(WindowConfig::default()); let event_loop = EventLoop::new(); - let window = WindowBuilder::new() - .with_resizable(resizable) - .with_titlebar_transparent(transparent) - .with_fullscreen(if fullscreen { - Some(Fullscreen::Borderless(None)) - } else { - None - }) - .with_fullsize_content_view(true) - .with_titlebar_buttons_hidden(false) - .with_title_hidden(true) - .with_menu(menu_bar_menu) - .with_inner_size(wry::application::dpi::LogicalSize::new(width, height)) - .build(&event_loop) - .unwrap(); + + #[cfg(windows)] + let init_window = || { + let window = WindowBuilder::new() + .with_resizable(resizable) + .with_transparent(transparent) + .with_fullscreen(if fullscreen { + Some(Fullscreen::Borderless(None)) + } else { + None + }) + .with_decorations(false) + .with_title("") + .with_inner_size(wry::application::dpi::LogicalSize::new(width, height)) + .build(&event_loop) + .unwrap(); + window + }; + + #[cfg(macos)] + let init_window = || { + let window = WindowBuilder::new() + .with_resizable(resizable) + .with_titlebar_transparent(transparent) + .with_fullscreen(if fullscreen { + Some(Fullscreen::Borderless(None)) + } else { + None + }) + .with_fullsize_content_view(true) + .with_titlebar_buttons_hidden(false) + .with_title_hidden(true) + .with_menu(menu_bar_menu) + .with_inner_size(wry::application::dpi::LogicalSize::new(width, height)) + .build(&event_loop) + .unwrap(); + window + }; + + let window = init_window(); let handler = move |window: &Window, req: String| { if req == "drag_window" { From d75e48996e597f421c37e9af74201db83a8d1cda Mon Sep 17 00:00:00 2001 From: m1911star Date: Sun, 6 Nov 2022 23:57:12 +0800 Subject: [PATCH 2/4] feat: add build script & add ico --- package.json | 1 + src-tauri/icons/icon.ico | Bin 4286 -> 4286 bytes src-tauri/tauri.conf.json | 5 ++++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a138df2..73a46fd 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "start": "npm run dev", "dev": "npm run tauri dev", "build": "npm run tauri build -- --target universal-apple-darwin", + "build:windows": "npm run tauri build -- --target x86_64-pc-windows-msvc", "tauri": "tauri" }, "license": "MIT", diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico index 5a1de882b2613c27ed8318858355ac85b7d86146..8956e142005ab07444f322433914ed741b4fb0de 100644 GIT binary patch literal 4286 zcmcgw&udg?6n#>RRm2E|E{ckjBBCUdNyW8)fmwB3@)z`9=(f97qqJBOB_>8EKLzb3 zLH907L1!Ttg1As=Ggy<9$t3sop8MVV=FXd$m~r8gn{(gyoqNuC-b%6%ExA zO=ycprwqKkc|mHm7mttO!UJA0gL*eMw|dsAy$Iu{UqYrP&z_rUdE&-2c$0dCwJ z;M#APZ{^}X@?-DZx8hBcgH7beK)?Xj~!)txm>i)@9D`;@-B|UKY35foYXG73}cVAj%EBjJ9t?8<&b_Ka>GJH z?_bI1;q%0WpOt!d^D1yK)5gCulyY7>#`JtvUGdrT3-1LNJ-^2U4m9q>l6k!c#y)aF z@AH-=KcnBjlJCcW+qNLlF4L`ZOyIcpjCi4N@92AbV$2x&Y5A;N?-!r5OwVpIy?@E{ zZjI^b4f+0kqwk((>^amMzU{@f2TXkvHK)!XyUl8T(?y2ylXA}e>0Muy-vh`raZ1iz z_KeGSW!?)q=v^<*hP4i*+&FK&aa9}Hg%|r=%YD0|<+%$iB@M%rySaw_^c;@J;(eNL z-%ok@p5&9lzGLFr^LRev5O5!*TEffqt!-0_|B{(>!>#nZbKt>~nqNcH4JeH;kIz)2w83KkKpP>yFAV>^sjf za$?_oU!HSrh9jPh`v~u zQx16hDCfG4dM}nMg5oo5ehHNuGNer4AyYSgQ=_w9>psJKad?#AqqiJ->yQxy@aRhz}P!Ct~n9$SALjRCsx$Dp(V&^U7u7<;&bt>5R^k0Z};+o{+}u%_LiK&-qBvO)Nb*d%Aq3*vZ) zeU|gMogV*@M_Y(71XhQ@CeGRKpvR7U3%jXaJ?~5HC2XM&F{Gd9uZTB36E7jc=6Efg zpF#}G+%a`C52TZGjbbBsR{o1QXrCpnRlijq`?Exc$Z3hG^IULXa<24I?LL=_Tw&o_ z*rdh@BN~V0v}|t7n3N^{b$&A^>N$>gjZsqwp6b2eso58!PmP;3;*p$^#afLiJK0vT zu9Xdx8@1V??aFgXn4Z<@eWwgWs>`KB${c9mztK-~$LAL@hPA1?$) zeDJ%z0$gWzYFTXq?OJz8GJpgafqYmY%>aY1AF?v-I|C=bz&%H801f74?V?agcx z*%+-amA1QL7x-OYO^mmXIR=zp-s?vpyfDvWkw^r5cS>~Lr^LPDOvYg3*4@4a#u!U4bZGYr1lr5x;TFi#o z&W{>vtnDH6UMMoT$NZ;tKzkAGPif^q#$dR)R^!k8`~<@-H}$jM{hf0$l{{N+F6H^J zO9vq|JI$Ekz#Q+j%7D@5_5X=``Cg#C2KT+0FYOGe_CtCI2Ls@}b_DYz2iIJhxyL*d zdjY-=a8Dg-x~%clo;TO!6mduFHP!aPIs_1yMG}sbQfK-`zOYIP4C~u WhOyx){zX6~(SHQ#?pJuli2V-(@{2hD diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 641594f..a7483d1 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -18,7 +18,10 @@ "all": true }, "bundle": { - "icon": ["icons/weRead.icns"], + "icon": [ + "icons/weRead.icns", + "icons/icon.ico" + ], "active": true, "category": "DeveloperTool", "copyright": "", From d3de87a3e0171de53ea5ebc60b37d0d8d7b03495 Mon Sep 17 00:00:00 2001 From: m1911star Date: Wed, 9 Nov 2022 17:09:48 +0800 Subject: [PATCH 3/4] fix: fix code review comments --- src-tauri/src/main.rs | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index c5c6edc..b50da05 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -1,12 +1,12 @@ use tauri_utils::config::{Config, WindowConfig}; -#[cfg(macos)] +#[cfg(target_os = "macos")] use wry::{ application::{ platform::macos::WindowBuilderExtMacOS, } }; -#[cfg(windows)] +#[cfg(target_os = "windows")] use wry::{ application::{ platform::windows::WindowBuilderExtWindows @@ -59,19 +59,20 @@ fn main() -> wry::Result<()> { } = get_windows_config().unwrap_or(WindowConfig::default()); let event_loop = EventLoop::new(); + let common_window = WindowBuilder::new() + .with_resizable(resizable) + .with_transparent(transparent) + .with_fullscreen(if fullscreen { + Some(Fullscreen::Borderless(None)) + } else { + None + }) + .with_inner_size(wry::application::dpi::LogicalSize::new(width, height)); #[cfg(windows)] let init_window = || { - let window = WindowBuilder::new() - .with_resizable(resizable) - .with_transparent(transparent) - .with_fullscreen(if fullscreen { - Some(Fullscreen::Borderless(None)) - } else { - None - }) + let window = common_window .with_decorations(false) .with_title("") - .with_inner_size(wry::application::dpi::LogicalSize::new(width, height)) .build(&event_loop) .unwrap(); window @@ -79,19 +80,11 @@ fn main() -> wry::Result<()> { #[cfg(macos)] let init_window = || { - let window = WindowBuilder::new() - .with_resizable(resizable) - .with_titlebar_transparent(transparent) - .with_fullscreen(if fullscreen { - Some(Fullscreen::Borderless(None)) - } else { - None - }) + let window = common_window .with_fullsize_content_view(true) .with_titlebar_buttons_hidden(false) .with_title_hidden(true) .with_menu(menu_bar_menu) - .with_inner_size(wry::application::dpi::LogicalSize::new(width, height)) .build(&event_loop) .unwrap(); window From 5bd6c1f2e8720b378d71a0d1555bb2674c52a1a8 Mon Sep 17 00:00:00 2001 From: m1911star Date: Wed, 9 Nov 2022 17:45:03 +0800 Subject: [PATCH 4/4] fix: fix code review comments --- src-tauri/src/main.rs | 49 ++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index b50da05..015ddf0 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -1,17 +1,8 @@ use tauri_utils::config::{Config, WindowConfig}; #[cfg(target_os = "macos")] -use wry::{ - application::{ - platform::macos::WindowBuilderExtMacOS, - } -}; - +use wry::application::platform::macos::WindowBuilderExtMacOS; #[cfg(target_os = "windows")] -use wry::{ - application::{ - platform::windows::WindowBuilderExtWindows - } -}; +use wry::application::platform::windows::WindowBuilderExtWindows; fn main() -> wry::Result<()> { use wry::{ @@ -68,29 +59,21 @@ fn main() -> wry::Result<()> { None }) .with_inner_size(wry::application::dpi::LogicalSize::new(width, height)); - #[cfg(windows)] - let init_window = || { - let window = common_window - .with_decorations(false) - .with_title("") - .build(&event_loop) - .unwrap(); - window - }; - #[cfg(macos)] - let init_window = || { - let window = common_window - .with_fullsize_content_view(true) - .with_titlebar_buttons_hidden(false) - .with_title_hidden(true) - .with_menu(menu_bar_menu) - .build(&event_loop) - .unwrap(); - window - }; - - let window = init_window(); + #[cfg(target_os = "windows")] + let window = common_window + .with_decorations(false) + .with_title("") + .build(&event_loop) + .unwrap(); + #[cfg(target_os = "macos")] + let window = common_window + .with_fullsize_content_view(true) + .with_titlebar_buttons_hidden(false) + .with_title_hidden(true) + .with_menu(menu_bar_menu) + .build(&event_loop) + .unwrap(); let handler = move |window: &Window, req: String| { if req == "drag_window" {