Skip to content

fix(desktop): gate macOS title_bar_style behind cfg for Linux builds #2031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jrtorrez31337 wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −13
Open

fix(desktop): gate macOS title_bar_style behind cfg for Linux builds #2031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions src-tauri/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,14 +666,16 @@ fn open_settings_window(app: &AppHandle) -> Result<(), String> {
return Ok(());
}

let _settings_window = WebviewWindowBuilder::new(app, "settings", WebviewUrl::App("settings.html".into()))
#[allow(unused_mut)]
let mut settings_builder = WebviewWindowBuilder::new(app, "settings", WebviewUrl::App("settings.html".into()))
.title("World Monitor Settings")
.title_bar_style(tauri::TitleBarStyle::Overlay)
.inner_size(980.0, 600.0)
.min_inner_size(820.0, 480.0)
.resizable(true)
.background_color(tauri::webview::Color(26, 28, 30, 255))
.build()
.background_color(tauri::webview::Color(26, 28, 30, 255));
#[cfg(target_os = "macos")]
{ settings_builder = settings_builder.title_bar_style(tauri::TitleBarStyle::Overlay); }
let _settings_window = settings_builder.build()
.map_err(|e| format!("Failed to create settings window: {e}"))?;

// On Windows/Linux, menus are per-window. Remove the inherited app menu
Expand Down Expand Up @@ -704,15 +706,17 @@ fn open_live_channels_window(app: &AppHandle, base_url: Option<String>) -> Resul
_ => WebviewUrl::App("live-channels.html".into()),
};

let _live_channels_window = WebviewWindowBuilder::new(app, "live-channels", url)
.title("Channel management - World Monitor")
.title_bar_style(tauri::TitleBarStyle::Overlay)
.inner_size(680.0, 760.0)
.min_inner_size(520.0, 600.0)
.resizable(true)
.background_color(tauri::webview::Color(26, 28, 30, 255))
.build()
.map_err(|e| format!("Failed to create live channels window: {e}"))?;
#[allow(unused_mut)]
let mut channels_builder = WebviewWindowBuilder::new(app, "live-channels", url)
.title("Channel management - World Monitor")
.inner_size(680.0, 760.0)
.min_inner_size(520.0, 600.0)
.resizable(true)
.background_color(tauri::webview::Color(26, 28, 30, 255));
#[cfg(target_os = "macos")]
{ channels_builder = channels_builder.title_bar_style(tauri::TitleBarStyle::Overlay); }
let _live_channels_window = channels_builder.build()
.map_err(|e| format!("Failed to create live channels window: {e}"))?;

#[cfg(not(target_os = "macos"))]
let _ = _live_channels_window.remove_menu();
Expand Down
Loading