GarandPLG/war-in-tunnels
1
0
Fork 0
generated from GarandPLG/rust-flake-template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor settings UI and add typed option handling

Browse Source 
- Rename `GameMode::Frontlines` to `FrontLines`.
- Introduce `SettingsValue` enum and `SettingsOption` vector for
  typed settings.
- Implement `Display` for `SettingsValue`, `GameMode`, and
  `PerkDecks`.
- Enhance settings keybindings: navigation with Up/Down, value
  parsing on Enter, and error messages.
- Update settings view to render options list, selection marker,
  and popup with error feedback.
- Restyle main menu selector and keybindings widget title.
- Add required imports and minor layout adjustments.
This commit is contained in:
GarandPLG
2026-03-16 21:42:08 +01:00
parent 1d8d1eed46
commit 53a713b5ea
6 changed files with 247 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/keybindings/settings.rs
+80 -5
View File
@@ -1,18 +1,91 @@
use crate::app::{
App, View,
keybindings::{Action, event_to_action},
states::SettingsValue,
};
use ratatui::crossterm::event::KeyEvent;
use std::any::type_name_of_val;
pub fn settings_keybindings(app: &mut App, key_event: &KeyEvent) {
if let Some(action) = event_to_action(&key_event) {
match action {
// Action::Up,
// Action::Down,
Action::Quit => app.exit = true,
Action::Quit2 => app.exit = true,
Action::Up => {
app.states.settings.selected_setting = app
.states
.settings
.selected_setting
.saturating_sub(1)
.max(0)
}
Action::Down => {
app.states.settings.selected_setting = app
.states
.settings
.selected_setting
.saturating_add(1)
.min(9)
}
Action::Esc => app.view = View::MainMenu,
Action::Space => app.states.settings.show_popup = !app.states.settings.show_popup,
Action::Enter => {
// FIXME: No feedback
if app.states.settings.show_popup {
let option =
&app.states.settings.options[app.states.settings.selected_setting].value;
let option_type: &'static str = type_name_of_val(option);
let new_value: String = app.states.settings.selected_setting_new_value.clone();
match option_type {
"u8" => {
if let Ok(value) = new_value.parse::<u8>() {
app.states.settings.options[app.states.settings.selected_setting]
.value = SettingsValue::U8(value);
app.states.settings.selected_setting_new_value = "".to_string();
app.states.settings.error_message = "".to_string();
app.states.settings.show_popup = false;
} else {
app.states.settings.error_message = "Invalid value".to_string();
}
}
"f32" => {
if let Ok(value) = new_value.parse::<f32>() {
app.states.settings.options[app.states.settings.selected_setting]
.value = SettingsValue::F32(value);
app.states.settings.selected_setting_new_value = "".to_string();
app.states.settings.error_message = "".to_string();
app.states.settings.show_popup = false;
} else {
app.states.settings.error_message = "Invalid value".to_string();
}
}
"u16" => {
if let Ok(value) = new_value.parse::<u16>() {
app.states.settings.options[app.states.settings.selected_setting]
.value = SettingsValue::U16(value);
app.states.settings.selected_setting_new_value = "".to_string();
app.states.settings.error_message = "".to_string();
app.states.settings.show_popup = false;
} else {
app.states.settings.error_message = "Invalid value".to_string();
}
}
"std::string::String" => {
app.states.settings.options[app.states.settings.selected_setting]
.value = SettingsValue::Text(new_value);
app.states.settings.selected_setting_new_value = "".to_string();
app.states.settings.error_message = "".to_string();
app.states.settings.show_popup = false;
}
_ => (),
}
}
}
Action::Backspace => {
if app.states.settings.show_popup {
app.states.settings.selected_setting_new_value.pop();
@@ -23,7 +96,9 @@ pub fn settings_keybindings(app: &mut App, key_event: &KeyEvent) {
app.states.settings.selected_setting_new_value.push(c);
}
}
_ => (),
Action::Quit => app.exit = true,
Action::Quit2 => app.exit = true,
// _ => (),
}
}
}