From 936e28b48367deeb5a690d0152728bcb7131047d Mon Sep 17 00:00:00 2001 From: Ansho Rei Date: Wed, 4 Nov 2026 13:03:32 +0100 Subject: [PATCH] feat: add an Exit button to the login screen The login screen could only be left with Ctrl+Q, which a gamepad cannot press. Exit sits below Connect as the last focus stop and goes through Action::Quit. --- CHANGELOG.md | 6 ++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- .../me.anshorei.Fettleshed.Remus.metainfo.xml | 1 + src/app.rs | 10 ++++++++-- ui/app.slint | 17 +++++++++++++++++ 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e2225a..8408f63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ One section per version, newest first. +## v0.6.0 (2026-11-04) + +### Features + +- The login screen has an Exit button below Connect, so remus can be closed from a controller before logging in. + ## v0.5.0 (2026-11-04) ### Features diff --git a/Cargo.lock b/Cargo.lock index df9e29e..2ca98e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4385,7 +4385,7 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "remus" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "directories", diff --git a/Cargo.toml b/Cargo.toml index 1b547ef..b6dcd77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "remus" -version = "0.5.0" +version = "0.6.0" edition = "2024" license = "MIT" diff --git a/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml b/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml index e28e8a6..a78335b 100644 --- a/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml +++ b/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml @@ -20,6 +20,7 @@ + diff --git a/src/app.rs b/src/app.rs index 74c936e..96cdd6d 100644 --- a/src/app.rs +++ b/src/app.rs @@ -370,7 +370,7 @@ impl App { } fn set_login_focus(&mut self, i: i32) { - self.login_focus = i.clamp(0, 3); + self.login_focus = i.clamp(0, 4); self.ui.set_login_focus(self.login_focus); self.ui.invoke_focus_login(self.login_focus); self.render_hints(); @@ -381,6 +381,7 @@ impl App { Action::Up | Action::SectionPrev => self.set_login_focus(self.login_focus - 1), Action::Down | Action::SectionNext => self.set_login_focus(self.login_focus + 1), Action::Activate if self.login_focus < 2 => self.set_login_focus(self.login_focus + 1), + Action::Activate if self.login_focus == 4 => self.action(Action::Quit), Action::Activate => self.login_submit(), _ => {} } @@ -1306,7 +1307,12 @@ impl App { }; match self.screen { Screen::Login => { - h(Control::Activate, if self.login_focus < 2 { "Next" } else { "Connect" }); + let label = match self.login_focus { + 0 | 1 => "Next", + 4 => "Exit", + _ => "Connect", + }; + h(Control::Activate, label); } Screen::Browse => match self.area { Area::Sidebar => { diff --git a/ui/app.slint b/ui/app.slint index eee2f6c..701590e 100644 --- a/ui/app.slint +++ b/ui/app.slint @@ -641,6 +641,7 @@ component LoginView inherits Rectangle { in property error; in property busy; callback submit; + callback exit; callback field-clicked(int); public function focus-field(i: int) { if (i == 0) { @@ -711,6 +712,21 @@ component LoginView inherits Rectangle { clicked => { root.submit(); } } } + // Secondary to Connect: outlined, no fill, and only lit when focused. + Rectangle { + height: 46px * Theme.s; + border-radius: 12px * Theme.s; + border-width: 2px * Theme.s; + border-color: root.focus-index == 4 ? Theme.focus : Theme.line; + Text { + text: "Exit"; + font-size: 17px * Theme.s; + color: root.focus-index == 4 ? Theme.text : Theme.muted; + } + TouchArea { + clicked => { root.exit(); } + } + } if root.error != "": Text { text: root.error; font-size: 15px * Theme.s; @@ -999,6 +1015,7 @@ export component AppWindow inherits Window { error: root.login-error; busy: root.login-busy; submit => { root.login-submit(); } + exit => { root.action(Action.quit); } field-clicked(i) => { root.login-field-clicked(i); } }