From 09da45fbd08ac448ec78a4175e1ae94a5e0039f4 Mon Sep 17 00:00:00 2001 From: Phoebus Date: Thu, 1 Oct 2026 19:16:27 -0700 Subject: [PATCH] fix(desktop): honor DMS Settings maximize in Mango --- docs/CHANGELOG.md | 5 +++-- docs/HANDOFF.md | 18 +++++++++++------- docs/STATUS.md | 11 ++++++++--- installer-rs/crates/phoebus-core/src/system.rs | 5 +++-- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 6974d9d..d8e8789 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -19,8 +19,9 @@ this file is the curated, human-readable summary. `xdg-utils` so this local page opens there. The live Welcome now routes Network, display and text controls to their exact DMS Settings pages, exposes the offline guide, installation help and DMS Welcome, and explains an absent - installer log. First login seeds - Kitty as the terminal and Firefox/Thunderbird for HTML/mail links only when + installer log. The Settings window rule now accepts maximize requests from + DMS, so its expand/restore button changes the window size under Mango. First + login seeds Kitty as the terminal and Firefox/Thunderbird for HTML/mail links only when the user has not chosen defaults. The existing installed QEMU playground verified the UI paths and offline Help; a fresh ISO/install remains pending the host space gate. diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md index e4b4ca0..e1a85a8 100644 --- a/docs/HANDOFF.md +++ b/docs/HANDOFF.md @@ -13,15 +13,19 @@ commit it. It should be short and current; use `git log` for detail. and Escape hides it. The live Welcome routes Network, display and text buttons to exact DMS tabs, retains its installation help, and shows a useful message before an installer log exists. First login fills missing terminal, - HTML and mail defaults with - Kitty, Firefox and Thunderbird. The existing visible disposable QEMU VM was - updated and the bar panels, DMS Settings pages, both welcome paths, Help and - assistant toggles were visually exercised. Both launcher shortcuts worked; - the launcher showed the new Help and DMS entries. Rust formatting, Clippy, + HTML and mail defaults with Kitty, Firefox and Thunderbird. The existing + visible disposable QEMU VM was updated and the bar panels, DMS Settings + pages, both welcome paths, Help and + assistant toggles were visually exercised. A follow-up control pass found + Mango's default maximize requests ignored; the Settings rule now sets + `ignore_maximize:0`, and DMS Settings expanded and restored correctly. Theme, + wallpaper and Settings search controls also worked. Both launcher shortcuts + worked; the launcher showed the new Help and DMS entries. Rust formatting, + Clippy, workspace tests, release and static builds, ShellCheck and desktop entry validation passed. The live-only install action and restart/shutdown actions - were inspected but not activated. A fresh ISO or - install is still gated by roughly 10 GiB free versus the 20 GiB requirement. + were inspected but not activated. A fresh ISO or install is still gated by + roughly 10 GiB free versus the 20 GiB requirement. - **Settings and pointer (2026-10-01):** The DMS Settings window was only about 500×400 because Mango floated it at its minimum size. A specific diff --git a/docs/STATUS.md b/docs/STATUS.md index 5cdb754..b580c85 100644 --- a/docs/STATUS.md +++ b/docs/STATUS.md @@ -57,9 +57,14 @@ Welcome button reopened it. DMS Settings rendered wallpaper, theme, text, time, sounds, Mango layout, bar setup/widgets/workspaces, notifications, dock/launcher, keybinds, display/gamma, network, default apps, audio, locale, clipboard, users, lock/power, plugins and About. The bar Widgets page took -several seconds to populate but did finish. The Assistant's floating window, -all five tabs, Super+A show/hide, and Escape hide were exercised. Phoebus -Welcome opened Help, DMS Welcome and Assistant, closed and reopened; Help +several seconds to populate but did finish. Settings' theme mode, wallpaper +cycle and fit mode, search, and maximize/restore controls were changed and +restored in the disposable VM. Mango's default +`ignore_maximize=1` had made the Settings expand button inert; the Settings +window rule now sets `ignore_maximize:0` and both sizes were verified visually. +The Assistant's floating window, all five tabs, Super+A show/hide, and Escape +hide were exercised. Phoebus Welcome opened Help, DMS Welcome and Assistant, +closed and reopened; Help loaded from its local HTML file with Super+F1. The live Welcome QML was also loaded in the installed VM for safe control testing: Network, display chooser and DMS display settings, text settings, Power/Cancel, advanced terminal, diff --git a/installer-rs/crates/phoebus-core/src/system.rs b/installer-rs/crates/phoebus-core/src/system.rs index eb5adb5..3bb41ba 100644 --- a/installer-rs/crates/phoebus-core/src/system.rs +++ b/installer-rs/crates/phoebus-core/src/system.rs @@ -1656,7 +1656,8 @@ tagrule=id:9,layout_name:tile layerrule=noanim:1,layer_name:^dms windowrule=isfloating:1,appid:^com.danklinux.dms$ -windowrule=width:900,height:700,appid:^com.danklinux.dms$,title:^Settings$ +# Mango ignores client maximize requests by default; DMS Settings has an expand button. +windowrule=width:900,height:700,ignore_maximize:0,appid:^com.danklinux.dms$,title:^Settings$ windowrule=isfloating:1,width:900,height:650,title:^Phoebus Assistant$ windowrule=isfloating:1,width:720,height:600,title:^Welcome to Phoebus OS$ windowrule=isfullscreen:1,title:^Install Phoebus OS$ @@ -3139,7 +3140,7 @@ mod tests { assert!(config.contains("setlayout,tile")); assert!(config.contains("togglefloating,")); assert!(config.contains( - "windowrule=width:900,height:700,appid:^com.danklinux.dms$,title:^Settings$" + "windowrule=width:900,height:700,ignore_maximize:0,appid:^com.danklinux.dms$,title:^Settings$" )); let (name, entry) = wayland_session_entry(DesktopProfile::Mango).unwrap();