Skip to content

Commit

Permalink
fix(macos): set default title-bar style to Visible, close #10225 (#…
Browse files Browse the repository at this point in the history
…10297)

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

* chore: add TODO
  • Loading branch information
pewsheen authored Jul 17, 2024
1 parent 7acac58 commit 9546548
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .changes/runtime-macos-default-visible-titlebat.md
Original file line number Diff line number Diff line change
@@ -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 changes: 14 additions & 1 deletion core/tauri-runtime-wry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 9546548

Please sign in to comment.