Skip to content

Commit 3329642

Browse files
committed
Merge branch 'main' into release
2 parents 3e7cebb + d77b44b commit 3329642

1 file changed

Lines changed: 21 additions & 14 deletions

File tree

src-tauri/src/lib.rs

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ async fn open_webview(
2020
}
2121

2222
// Build the webview window
23-
WebviewWindowBuilder::new(
23+
let mut builder = WebviewWindowBuilder::new(
2424
&app,
2525
&new_id,
2626
tauri::WebviewUrl::External(url.parse().map_err(|e| format!("Invalid URL: {}", e))?),
@@ -30,19 +30,26 @@ async fn open_webview(
3030
.inner_size(1280.0, 800.0)
3131
.focused(true)
3232
.center()
33-
.devtools(true)
34-
.drag_and_drop(false)
35-
.zoom_hotkeys_enabled(true)
36-
.maximizable(true)
37-
.resizable(true)
38-
.minimizable(true)
39-
.closable(true)
40-
.on_new_window(|_url, _features| {
41-
// Allow popup windows to open
42-
NewWindowResponse::Allow
43-
})
44-
.build()
45-
.map_err(|e| format!("Failed to create webview: {}", e))?;
33+
.devtools(true);
34+
35+
// drag_and_drop is only available on Windows
36+
#[cfg(target_os = "windows")]
37+
{
38+
builder = builder.drag_and_drop(false);
39+
}
40+
41+
builder
42+
.zoom_hotkeys_enabled(true)
43+
.maximizable(true)
44+
.resizable(true)
45+
.minimizable(true)
46+
.closable(true)
47+
.on_new_window(|_url, _features| {
48+
// Allow popup windows to open
49+
NewWindowResponse::Allow
50+
})
51+
.build()
52+
.map_err(|e| format!("Failed to create webview: {}", e))?;
4653

4754
Ok(())
4855
}

0 commit comments

Comments
 (0)