Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'persist_debug_checkbox' into 'master'

Browse Source 
Persist interface debug checkbox across sessions

See merge request veloren/veloren!3147
This commit is contained in:
Imbris 2022-02-13 19:43:51 +00:00
commit ddcee8448b
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
voxygen/src/hud/mod.rs
View File

@ -643,7 +643,6 @@ pub struct Show {
intro: bool, intro: bool,
help: bool, help: bool,
crafting: bool, crafting: bool,
debug: bool,
bag: bool, bag: bool,
bag_inv: bool, bag_inv: bool,
trade: bool, trade: bool,
@ -1037,7 +1036,6 @@ impl Hud {
show: Show { show: Show {
help: false, help: false,
intro: false, intro: false,
debug: false,
bag: false, bag: false,
bag_inv: false, bag_inv: false,
trade: false, trade: false,
@ -3150,12 +3148,8 @@ impl Hud {
InterfaceChange::ToggleHelp(toggle_help) => { InterfaceChange::ToggleHelp(toggle_help) => {
self.show.help = *toggle_help; self.show.help = *toggle_help;
}, },
InterfaceChange::ToggleDebug(toggle_debug) => {
self.show.debug = *toggle_debug;
},
InterfaceChange::ResetInterfaceSettings => { InterfaceChange::ResetInterfaceSettings => {
self.show.help = false; self.show.help = false;
self.show.debug = false;
}, },
_ => {}, _ => {},
}, },
@ -4015,7 +4009,6 @@ impl Hud {
GameInput::ToggleDebug if state => { GameInput::ToggleDebug if state => {
global_state.settings.interface.toggle_debug = global_state.settings.interface.toggle_debug =
!global_state.settings.interface.toggle_debug; !global_state.settings.interface.toggle_debug;
self.show.debug = global_state.settings.interface.toggle_debug;
true true
}, },
#[cfg(feature = "egui-ui")] #[cfg(feature = "egui-ui")]

4
voxygen/src/hud/settings_window/interface.rs
View File

@ -228,7 +228,7 @@ impl<'a> Widget for Interface<'a> {
// Debug // Debug
let show_debug = ToggleButton::new( let show_debug = ToggleButton::new(
self.show.debug, self.global_state.settings.interface.toggle_debug,
self.imgs.checkbox, self.imgs.checkbox,
self.imgs.checkbox_checked, self.imgs.checkbox_checked,
) )
@ -238,7 +238,7 @@ impl<'a> Widget for Interface<'a> {
.press_images(self.imgs.checkbox_press, self.imgs.checkbox_checked) .press_images(self.imgs.checkbox_press, self.imgs.checkbox_checked)
.set(state.ids.debug_button, ui); .set(state.ids.debug_button, ui);
if self.show.debug != show_debug { if self.global_state.settings.interface.toggle_debug != show_debug {
events.push(ToggleDebug(show_debug)); events.push(ToggleDebug(show_debug));
} }