mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-21 17:41:25 -08:00
fix(macos): make native and custom titlebar consistent
This commit is contained in:
3 files changed
+17
-18
No files matched your search
@@ -0,0 +1,5 @@
|
||||
---
|
||||
default: patch
|
||||
---
|
||||
|
||||
Remove the duplicate title on macos title bar. Also fixes the duplicate title bar when the custom one is enabled on macos.
|
||||
@@ -196,18 +196,11 @@ fn apply_main_window_title_bar_settings(
|
||||
window.set_decorations(!settings.use_custom_title_bar)?;
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
window.set_title_bar_style(if settings.use_custom_title_bar {
|
||||
tauri::TitleBarStyle::Transparent
|
||||
} else {
|
||||
tauri::TitleBarStyle::Visible
|
||||
})?;
|
||||
window.set_title(if settings.use_custom_title_bar {
|
||||
""
|
||||
} else {
|
||||
crate::main_window_title(app)
|
||||
})?;
|
||||
}
|
||||
window.set_title_bar_style(if settings.use_custom_title_bar {
|
||||
tauri::TitleBarStyle::Overlay
|
||||
} else {
|
||||
tauri::TitleBarStyle::Visible
|
||||
})?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -192,13 +192,14 @@ pub fn show_or_create_main_window(app: &AppHandle<crate::BrowserEngine>) -> taur
|
||||
.visible(false);
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
let builder = if desktop_settings.use_custom_title_bar {
|
||||
let builder =
|
||||
builder
|
||||
.title("")
|
||||
.title_bar_style(tauri::TitleBarStyle::Transparent)
|
||||
} else {
|
||||
builder.title_bar_style(tauri::TitleBarStyle::Visible)
|
||||
};
|
||||
.hidden_title(true)
|
||||
.title_bar_style(if desktop_settings.use_custom_title_bar {
|
||||
tauri::TitleBarStyle::Overlay
|
||||
} else {
|
||||
tauri::TitleBarStyle::Visible
|
||||
});
|
||||
|
||||
#[cfg(any(target_os = "windows", target_os = "linux"))]
|
||||
let builder = builder.decorations(!desktop_settings.use_custom_title_bar);
|
||||
|
||||
Reference in new issue
Block a user