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 'xvar/fix-egui-toggle' into 'master'

Browse Source 
Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled

See merge request veloren/veloren!2793
This commit is contained in:
Joshua Barretto 2021-08-31 17:07:13 +00:00
commit 171e329609
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
voxygen/src/run.rs
View File

@ -196,10 +196,7 @@ fn handle_main_events_cleared(
last.render(&mut drawer, &global_state.settings);
#[cfg(feature = "egui-ui")]
if last.egui_enabled()
&& global_state.settings.interface.toggle_debug
&& global_state.settings.interface.toggle_egui_debug
{
if last.egui_enabled() && global_state.settings.interface.egui_enabled() {
drawer.draw_egui(&mut global_state.egui_state.platform, scale_factor);
}
};

2
voxygen/src/session/mod.rs
View File

@ -1031,7 +1031,7 @@ impl PlayState for SessionState {
// Maintain egui (debug interface)
#[cfg(feature = "egui-ui")]
if global_state.settings.interface.toggle_debug {
if global_state.settings.interface.egui_enabled() {
global_state.egui_state.maintain(
&self.client.borrow(),
&mut self.scene,

5
voxygen/src/settings/interface.rs
View File

@ -81,3 +81,8 @@ impl Default for InterfaceSettings {
}
}
}
#[cfg(feature = "egui-ui")]
impl InterfaceSettings {
pub fn egui_enabled(&self) -> bool { self.toggle_debug && self.toggle_egui_debug }
}