tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-12-24 19:25:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(macos): set default title-bar style to Visible, close #10225 (#10297)

Browse Source 
* fix(macos): set default title-bar style to `Visible`

* chore: add TODO
This commit is contained in:
Jason Tsai 2024-07-17 11:40:38 +08:00 committed by GitHub
parent 7acac58d23
commit 9546548ec0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/runtime-macos-default-visible-titlebat.md Normal file
View File

@ -0,0 +1,6 @@
---
"tauri": "patch:bug"
"tauri-runtime-wry": "patch"
---
On macOS, set default titlebar style to `Visible` to prevent webview move out of the view.

15
core/tauri-runtime-wry/src/lib.rs
View File

@ -715,7 +715,20 @@ unsafe impl Send for WindowBuilderWrapper {}
impl WindowBuilderBase for WindowBuilderWrapper {}
impl WindowBuilder for WindowBuilderWrapper {
fn new() -> Self {
Self::default().focused(true)
#[allow(unused_mut)]
let mut builder = Self::default().focused(true);
#[cfg(target_os = "macos")]
{
// TODO: find a proper way to prevent webview being pushed out of the window.
// Workround for issue: https://github.com/tauri-apps/tauri/issues/10225
// The window requies `NSFullSizeContentViewWindowMask` flag to prevent devtools
// pushing the content view out of the window.
// By setting the default style to `TitleBarStyle::Visible` should fix the issue for most of the users.
builder = builder.title_bar_style(TitleBarStyle::Visible);
}
builder
}
fn with_config(config: &WindowConfig) -> Self {