diff --git a/apps/solidcraft/src/main.rs b/apps/solidcraft/src/main.rs index 39f9e6d0a..615d0b4d2 100644 --- a/apps/solidcraft/src/main.rs +++ b/apps/solidcraft/src/main.rs @@ -818,6 +818,24 @@ fn msaa() -> Option { /// (`solidcraft_ui_egui::titlebar`). macOS keeps its traffic lights over the integrated bar. const CUSTOM_TITLEBAR: bool = !cfg!(target_os = "macos"); +/// Linux: the window manager's own decorations (server-side, or the compositor's frame) can be +/// asked for instead of the application bar ([`titlebar_choice`]). Elsewhere always `true`. +fn app_titlebar_wanted() -> bool { + if !cfg!(all(unix, not(target_os = "macos"))) { + return true; + } + let setting = graphics().and_then(|v| v.get("titlebar").and_then(serde_json::Value::as_str).map(str::to_string)); + titlebar_choice(solidcraft_engine::geom::env::var("TITLEBAR").as_deref(), setting.as_deref()) +} + +/// Linux: whether the application bar is the title bar. `SOLIDCRAFT_TITLEBAR` (else +/// `graphics.json`'s `titlebar`) set to `system` gives the window the desktop's own title bar and +/// buttons; `app` (or anything else, or nothing) keeps the application bar as the title bar. +fn titlebar_choice(env: Option<&str>, setting: Option<&str>) -> bool { + let choice = env.map(str::trim).filter(|v| !v.is_empty()).or(setting.map(str::trim)); + !choice.is_some_and(|v| v.eq_ignore_ascii_case("system")) +} + const DEPTH_BITS: u8 = 24; /// A 32-bit float depth buffer, drawn with reversed depth (1 near, 0 far) so its precision follows /// the distance from the eye (#1434). Only where every adapter offers it with a stencil @@ -988,7 +1006,7 @@ fn main() -> eframe::Result { eframe::egui_wgpu::WgpuSetup::CreateNew(setup) => setup.instance_descriptor.backends, _ => eframe::wgpu::Backends::all(), }; - let custom_titlebar = CUSTOM_TITLEBAR && !startup::system_title_bar(cfg!(target_os = "windows"), started); + let custom_titlebar = CUSTOM_TITLEBAR && app_titlebar_wanted() && !startup::system_title_bar(cfg!(target_os = "windows"), started); eframe::egui_wgpu::set_startup_hook(startup_step); solidcraft_engine::crash::phase("window"); let options = eframe::NativeOptions { @@ -1405,6 +1423,22 @@ mod backend_tests { assert!(!prefer_x11(true, true, Some("GNOME"), over(Some("wayland")))); assert!(prefer_x11(true, true, Some("niri"), over(Some("x11")))); } + + #[test] + fn the_desktops_title_bar_only_when_asked_for() { + use super::titlebar_choice; + // Nothing set: the application bar is the title bar, as before. + assert!(titlebar_choice(None, None)); + // graphics.json's `titlebar`. + assert!(!titlebar_choice(None, Some("system"))); + assert!(titlebar_choice(None, Some("app"))); + // SOLIDCRAFT_TITLEBAR wins over the file; empty counts as unset; case and spaces don't matter. + assert!(!titlebar_choice(Some(" System "), Some("app"))); + assert!(titlebar_choice(Some("app"), Some("system"))); + assert!(!titlebar_choice(Some(""), Some("system"))); + // Anything unknown keeps the application bar. + assert!(titlebar_choice(Some("ssd"), None)); + } } #[cfg(test)] diff --git a/docs/book/src/guide/ui-tour.md b/docs/book/src/guide/ui-tour.md index 27e763331..c168b5866 100644 --- a/docs/book/src/guide/ui-tour.md +++ b/docs/book/src/guide/ui-tour.md @@ -6,7 +6,10 @@ the File menu (New, Open, Save, Save As, Export…), undo and redo, the Home tab (the start page) and one tab per open design (each with its own undo history, selection and camera; a dot marks unsaved changes). On the right: Report a bug, Help (?), Preferences (which hold the theme) and the - window's buttons. + window's buttons. On Linux, to have your desktop's own title bar and window buttons instead, set + `SOLIDCRAFT_TITLEBAR=system` or put `"titlebar": "system"` in `graphics.json` in the settings + folder (see [Troubleshooting](troubleshooting.md#reset-the-settings)) and restart; `app` (the + default) puts the application bar back. - **Toolbar.** The workspace switcher (DESIGN) sits on the left. The tabs (MODEL, SURFACE, ASSEMBLE, INSERT, INSPECT, MANAGE, VIEW and SHEET METAL) hold sections of commands. SKETCH appears while editing a sketch; SHEET METAL is always there and is highlighted for the active sheet body. Both select automatically