From afc6d2b9ec66266665a02c2bd8ac827676b67787 Mon Sep 17 00:00:00 2001
From: m1911star <lhlxtl@gmail.com>
Date: Sun, 6 Nov 2022 23:44:24 +0800
Subject: [PATCH] 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<i8N^ZZ!A?XX3#j$j|Gs^DCy
z16U{OCJe$NOoff@4D9Q`XTX|p6*l79R)@_t<6P+n>%_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<KxBR;Ew+F#F>@1V??aFgXn4Z<@eWwgWs>`KB${c9mztK-~$LAL@hPA1?$)
zeDJ%z0$gWzYFTXq?<v-pT86l&E`XkrEin161=MF@d<c0c<XC7~DL4MQQHjCg%mnma
zJb-e0*iJ1Q$8n;5=8gP9`v-2Fgh)7qCCvH<AJ~zD?dVs5)=jzbx35#<Pkm^Go-<ox
zWD;Sm)K9tt-Y%_svg4_#TXNrj<2Xb@i&}<lEEP6d<-kgqdR%fl*7iv2rWjLfSTE)n
z#c1qBgC3{&Qx4Kv(0Y>OJz8GJpgafqYmY%>aY1AF?v-I|C=bz&%H801f74?V?agcx
z*%+-amA1QL7x-OYO^mmXIR=zp-s?vpyfDvWkw^r5cS>~Lr^LPDOvYg3*<Fnv@VS`d
zp3|FQwDrE(KhVu_NeiyRcjN>4@4a#u!U4bZGYr1lr<iAd_h*ei{;DzU+>5x;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!6mduF<v2`rjMh87R~Dy6g$;5~8h%o@I_{Hw7pk?0`<<(F
z8%#Uf7@vM95Be@2N<R0ZFqb=j#B-%$;KKLHU_%w=;S|Sx+WC^#CdEB|j@5Gvrab$^
zpTDf;QJ-4VRQI0WkFh8c?*MtuQ{#!|V}H!~3(uW?c@{L!$ck%=I$A&Fg1Zt+^4Q2v
z-1(F5M6|w=KYuH{XdkWmqQ|Mtyt7Z{`5Wi0>HP!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" {