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 'imbris/fix-egui-mouse-capture' into 'master'

Browse Source 
Fix egui capturing mouse when hidden.

See merge request veloren/veloren!3140
This commit is contained in:
Imbris 2022-01-25 14:41:50 +00:00
commit f9ce85164f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
voxygen/src/run.rs
View File

@ -33,9 +33,15 @@ pub fn run(mut global_state: GlobalState, event_loop: EventLoop) {
#[cfg(feature = "egui-ui")]
{
global_state.egui_state.platform.handle_event(&event);
if global_state.egui_state.platform.captures_event(&event) {
return;
let enabled_for_current_state =
states.last().map_or(false, |state| state.egui_enabled());
// Only send events to the egui UI when it is being displayed.
if enabled_for_current_state && global_state.settings.interface.egui_enabled() {
global_state.egui_state.platform.handle_event(&event);
if global_state.egui_state.platform.captures_event(&event) {
return;
}
}
}