fix(desktop): enable DMS cursor controls and scale Settings
Some checks are pending
ci / test (push) Waiting to run
Some checks are pending
ci / test (push) Waiting to run
This commit is contained in:
parent
09da45fbd0
commit
77547b5d95
4 changed files with 59 additions and 4 deletions
|
|
@ -5,6 +5,16 @@ this file is the curated, human-readable summary.
|
||||||
|
|
||||||
## Unreleased — Fast defaults with user-controlled source builds
|
## Unreleased — Fast defaults with user-controlled source builds
|
||||||
|
|
||||||
|
- **DMS cursor and responsive Settings (2026-10-02).** Phoebus now includes
|
||||||
|
DMS's managed Mango cursor fragment from the first session, so the Theme &
|
||||||
|
Colors cursor controls no longer require a manual Add/Setup step. Existing
|
||||||
|
user configs gain the include once while preserving their other settings;
|
||||||
|
removing it later remains the user's choice. Settings now opens at 65% of
|
||||||
|
the current output width and 80% of its height instead of a fixed 900×700,
|
||||||
|
while its expand/restore button still works. The existing disposable QEMU
|
||||||
|
VM confirmed approximately 1092×840 at 1680×1050 and 832×614 at
|
||||||
|
1280×768; DMS's include resolver reported the cursor fragment present.
|
||||||
|
|
||||||
- **Desktop controls, welcome and offline help (2026-10-01).** Audited the
|
- **Desktop controls, welcome and offline help (2026-10-01).** Audited the
|
||||||
running disposable QEMU desktop across the top bar, control center, DMS
|
running disposable QEMU desktop across the top bar, control center, DMS
|
||||||
Settings, DMS onboarding and both Phoebus welcome variants. The Assistant
|
Settings, DMS onboarding and both Phoebus welcome variants. The Assistant
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,22 @@
|
||||||
Rolling note between work sessions. **Update this file before you finish**, then
|
Rolling note between work sessions. **Update this file before you finish**, then
|
||||||
commit it. It should be short and current; use `git log` for detail.
|
commit it. It should be short and current; use `git log` for detail.
|
||||||
|
|
||||||
|
- **DMS cursor and Settings sizing (2026-10-02):** The packaged Mango config
|
||||||
|
sources `./dms/cursor.conf`, and the session creates that fragment before
|
||||||
|
Mango starts. A one-time marker lets existing user configs gain the include
|
||||||
|
without replacing custom settings or re-adding it after a user removes it.
|
||||||
|
Mango 0.17.2 interprets floating window rule dimensions below 1 as output
|
||||||
|
fractions; DMS Settings now opens at 0.65×width and 0.8×height, retaining
|
||||||
|
`ignore_maximize:0`. The visible disposable VM showed roughly 1092×840 at
|
||||||
|
1680×1050 and 832×614 at 1280×768, and the DMS CLI include resolver
|
||||||
|
returned `{"exists":true,"included":true}` for a clean temporary profile.
|
||||||
|
The emitted session migration passed a temporary-home check: it adds the
|
||||||
|
include once and respects later removal. The packaged config and session
|
||||||
|
script were deployed to the existing VM, which was returned to 1680×1050.
|
||||||
|
`make check`, release and static builds, and ShellCheck passed. Fresh
|
||||||
|
ISO/install verification remains blocked by the 20 GiB host free-space gate
|
||||||
|
(currently 10 GiB).
|
||||||
|
|
||||||
- **Shell control and help pass (2026-10-01):** Added an offline Phoebus Help
|
- **Shell control and help pass (2026-10-01):** Added an offline Phoebus Help
|
||||||
page, launcher and Super+F1 shortcut; DMS Welcome now has a separate launcher,
|
page, launcher and Super+F1 shortcut; DMS Welcome now has a separate launcher,
|
||||||
Super+Alt+W shortcut and button in Phoebus Welcome. The live medium manifest
|
Super+Alt+W shortcut and button in Phoebus Welcome. The live medium manifest
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,20 @@ disposable VM; `serial-driver.py recovery` now automates the same check.
|
||||||
|
|
||||||
## Matrix
|
## Matrix
|
||||||
|
|
||||||
|
Desktop cursor and sizing follow-up (2026-10-02): the default Mango config
|
||||||
|
now sources DMS's managed cursor fragment, and the session creates it before
|
||||||
|
Mango starts. Existing profiles gain the include once without overwriting
|
||||||
|
their other settings. DMS's `resolve-include` returned `exists=true` and
|
||||||
|
`included=true` for a clean profile in the disposable VM. The Settings rule
|
||||||
|
uses 65% of the active output width and 80% of its height, retaining maximize
|
||||||
|
support. In the running VM it opened at approximately 1092×840 on 1680×1050
|
||||||
|
and 832×614 on 1280×768; the VM was restored to 1680×1050. A fresh image
|
||||||
|
install with these defaults is not verified because the host has 10 GiB free
|
||||||
|
against the 20 GiB VM gate. The emitted session migration passed a temporary
|
||||||
|
home check (add once, idempotent, respects later removal); `make check`,
|
||||||
|
release/static builds and ShellCheck passed. The running VM's packaged config
|
||||||
|
and session launcher now carry the change.
|
||||||
|
|
||||||
Desktop control audit (2026-10-01): in the existing disposable QEMU desktop,
|
Desktop control audit (2026-10-01): in the existing disposable QEMU desktop,
|
||||||
the top-bar launcher, Super+Space and Super+P launcher shortcuts, clipboard,
|
the top-bar launcher, Super+Space and Super+P launcher shortcuts, clipboard,
|
||||||
process/CPU/memory panels, notifications, power profile, control center and
|
process/CPU/memory panels, notifications, power profile, control center and
|
||||||
|
|
|
||||||
|
|
@ -1450,8 +1450,18 @@ mkdir -p "$HOME/.config/mango/dms"
|
||||||
if [ ! -e "$mango_conf" ] && [ -r /etc/xdg/mango/config.conf ]; then
|
if [ ! -e "$mango_conf" ] && [ -r /etc/xdg/mango/config.conf ]; then
|
||||||
cp /etc/xdg/mango/config.conf "$mango_conf"
|
cp /etc/xdg/mango/config.conf "$mango_conf"
|
||||||
fi
|
fi
|
||||||
|
# Older Phoebus profiles predate DMS's cursor fragment. Add its include once,
|
||||||
|
# preserving every other user setting. The marker lets a user remove it later.
|
||||||
|
cursor_include_marker="$HOME/.config/mango/dms/.phoebus-cursor-include-v1"
|
||||||
|
if [ ! -e "$cursor_include_marker" ] && [ -w "$mango_conf" ]; then
|
||||||
|
if grep -Eq '^[[:space:]]*source=.*dms/cursor\.conf([[:space:]]|$)' "$mango_conf"; then
|
||||||
|
: > "$cursor_include_marker"
|
||||||
|
elif printf '\n# Let DMS manage the cursor theme and size.\nsource=./dms/cursor.conf\n' >> "$mango_conf"; then
|
||||||
|
: > "$cursor_include_marker"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
# DMS manages these fragments; they must exist before Mango sources them.
|
# DMS manages these fragments; they must exist before Mango sources them.
|
||||||
for f in colors layout outputs; do
|
for f in colors layout outputs cursor; do
|
||||||
[ -e "$HOME/.config/mango/dms/$f.conf" ] || : > "$HOME/.config/mango/dms/$f.conf"
|
[ -e "$HOME/.config/mango/dms/$f.conf" ] || : > "$HOME/.config/mango/dms/$f.conf"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
@ -1615,10 +1625,11 @@ wait "$MANGO_PID"
|
||||||
/// `~/.config/mango/dms/`; this file only provides a sane baseline and the
|
/// `~/.config/mango/dms/`; this file only provides a sane baseline and the
|
||||||
/// DMS keybindings. It is copied to the user's config on first session start.
|
/// DMS keybindings. It is copied to the user's config on first session start.
|
||||||
pub const MANGO_CONFIG_DEFAULT: &str = r#"# Phoebus default Mango configuration (packaged; copied once, then user-owned).
|
pub const MANGO_CONFIG_DEFAULT: &str = r#"# Phoebus default Mango configuration (packaged; copied once, then user-owned).
|
||||||
# DMS manages colors/layout/outputs in ~/.config/mango/dms/*.conf.
|
# DMS manages colors/layout/outputs/cursor in ~/.config/mango/dms/*.conf.
|
||||||
source=~/.config/mango/dms/colors.conf
|
source=~/.config/mango/dms/colors.conf
|
||||||
source=~/.config/mango/dms/layout.conf
|
source=~/.config/mango/dms/layout.conf
|
||||||
source=~/.config/mango/dms/outputs.conf
|
source=~/.config/mango/dms/outputs.conf
|
||||||
|
source=./dms/cursor.conf
|
||||||
|
|
||||||
env=QT_QPA_PLATFORM,wayland
|
env=QT_QPA_PLATFORM,wayland
|
||||||
env=ELECTRON_OZONE_PLATFORM_HINT,auto
|
env=ELECTRON_OZONE_PLATFORM_HINT,auto
|
||||||
|
|
@ -1657,7 +1668,8 @@ tagrule=id:9,layout_name:tile
|
||||||
layerrule=noanim:1,layer_name:^dms
|
layerrule=noanim:1,layer_name:^dms
|
||||||
windowrule=isfloating:1,appid:^com.danklinux.dms$
|
windowrule=isfloating:1,appid:^com.danklinux.dms$
|
||||||
# Mango ignores client maximize requests by default; DMS Settings has an expand button.
|
# 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$
|
# Size Settings to the current output; DMS switches to compact navigation below 700 px.
|
||||||
|
windowrule=width:0.65,height:0.8,ignore_maximize:0,appid:^com.danklinux.dms$,title:^Settings$
|
||||||
windowrule=isfloating:1,width:900,height:650,title:^Phoebus Assistant$
|
windowrule=isfloating:1,width:900,height:650,title:^Phoebus Assistant$
|
||||||
windowrule=isfloating:1,width:720,height:600,title:^Welcome to Phoebus OS$
|
windowrule=isfloating:1,width:720,height:600,title:^Welcome to Phoebus OS$
|
||||||
windowrule=isfullscreen:1,title:^Install Phoebus OS$
|
windowrule=isfullscreen:1,title:^Install Phoebus OS$
|
||||||
|
|
@ -3103,6 +3115,8 @@ mod tests {
|
||||||
}
|
}
|
||||||
// User config is seeded, never overwritten.
|
// User config is seeded, never overwritten.
|
||||||
assert!(script.contains("if [ ! -e \"$mango_conf\" ]"));
|
assert!(script.contains("if [ ! -e \"$mango_conf\" ]"));
|
||||||
|
assert!(script.contains(".phoebus-cursor-include-v1"));
|
||||||
|
assert!(script.contains("for f in colors layout outputs cursor; do"));
|
||||||
assert!(script.contains("dbus-update-activation-environment --systemd"));
|
assert!(script.contains("dbus-update-activation-environment --systemd"));
|
||||||
assert!(script.contains("wait \"$MANGO_PID\""));
|
assert!(script.contains("wait \"$MANGO_PID\""));
|
||||||
// WAYLAND_DISPLAY must not be set before the compositor starts, or
|
// WAYLAND_DISPLAY must not be set before the compositor starts, or
|
||||||
|
|
@ -3129,6 +3143,7 @@ mod tests {
|
||||||
assert!(config.contains("XF86MonBrightnessDown"));
|
assert!(config.contains("XF86MonBrightnessDown"));
|
||||||
assert!(config.contains("phoebus-assistant"));
|
assert!(config.contains("phoebus-assistant"));
|
||||||
assert!(config.contains("source=~/.config/mango/dms/"));
|
assert!(config.contains("source=~/.config/mango/dms/"));
|
||||||
|
assert!(config.contains("source=./dms/cursor.conf"));
|
||||||
assert!(config.contains("focusstack,next"));
|
assert!(config.contains("focusstack,next"));
|
||||||
assert!(config.contains("focusstack,prev"));
|
assert!(config.contains("focusstack,prev"));
|
||||||
assert!(config.contains("zoom,"));
|
assert!(config.contains("zoom,"));
|
||||||
|
|
@ -3140,7 +3155,7 @@ mod tests {
|
||||||
assert!(config.contains("setlayout,tile"));
|
assert!(config.contains("setlayout,tile"));
|
||||||
assert!(config.contains("togglefloating,"));
|
assert!(config.contains("togglefloating,"));
|
||||||
assert!(config.contains(
|
assert!(config.contains(
|
||||||
"windowrule=width:900,height:700,ignore_maximize:0,appid:^com.danklinux.dms$,title:^Settings$"
|
"windowrule=width:0.65,height:0.8,ignore_maximize:0,appid:^com.danklinux.dms$,title:^Settings$"
|
||||||
));
|
));
|
||||||
|
|
||||||
let (name, entry) = wayland_session_entry(DesktopProfile::Mango).unwrap();
|
let (name, entry) = wayland_session_entry(DesktopProfile::Mango).unwrap();
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue