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

replace conditional LayerEntry construction during input check

Browse Source
This commit is contained in:
JimmyDdotEXE 2023-07-23 20:46:33 -04:00
parent 77fb2150d9
commit 18d74e6a8e
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
voxygen/src/window.rs
View File

@ -608,30 +608,25 @@ impl Window {
}
}
let l_entry: LayerEntry;
if modifiers.len() == 2 {
// this uses the known modifiers from ControllerSettings so RB+LB
// represents the same layer as LB+RB
l_entry = LayerEntry {
button: *button,
mod1: settings.modifier_buttons[0],
mod2: settings.modifier_buttons[1],
};
} else if modifiers.len() == 1 {
l_entry = LayerEntry {
button: *button,
mod1: modifiers[0],
mod2: Button::default(),
};
} else {
l_entry = LayerEntry {
button: *button,
mod1: Button::default(),
mod2: Button::default(),
};
}
// have to make two LayerEntries so LB+RB can be treated equivalent to RB+LB
let l_entry1 = LayerEntry {
button: *button,
mod1: modifiers.get(0).copied().unwrap_or_default(),
mod2: modifiers.get(1).copied().unwrap_or_default(),
};
let l_entry2 = LayerEntry {
button: *button,
mod1: modifiers.get(1).copied().unwrap_or_default(),
mod2: modifiers.get(0).copied().unwrap_or_default(),
};
if let Some(evs) = settings.layer_button_map.get(&l_entry) {
// have to check l_entry1 and then l_entry2 so LB+RB can be treated equivalent
// to RB+LB
if let Some(evs) = settings.layer_button_map.get(&l_entry1) {
for ev in evs {
events.push(Event::InputUpdate(*ev, is_pressed));
}
} else if let Some(evs) = settings.layer_button_map.get(&l_entry2) {
for ev in evs {
events.push(Event::InputUpdate(*ev, is_pressed));
}