phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-12-01 08:37:23 +00:00
Code Issues Releases Wiki Activity

Fixed left/right in menu on Android

Browse source
This commit is contained in:
dawnDus 2022-02-11 19:07:27 -05:00
parent 8cd22b932b
commit b457f5dd6f
No known key found for this signature in database
GPG key ID: 972AABDE81848F21
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/menu/mod.rs
View file

@ -506,6 +506,8 @@ impl Menu {
let entry_bounds = Rect::new_size(self.x, y as isize, self.width as isize, entry.height() as isize); let entry_bounds = Rect::new_size(self.x, y as isize, self.width as isize, entry.height() as isize);
let right_entry_bounds = let right_entry_bounds =
Rect::new_size(self.x + self.width as isize, y as isize, self.width as isize, entry.height() as isize); Rect::new_size(self.x + self.width as isize, y as isize, self.width as isize, entry.height() as isize);
let left_entry_bounds =
Rect::new_size(self.x - self.width as isize, y as isize, self.width as isize, entry.height() as isize);
y += entry.height() as f32; y += entry.height() as f32;
match entry { match entry {
@ -522,26 +524,29 @@ impl Menu {
return MenuSelectionResult::Selected(idx, entry); return MenuSelectionResult::Selected(idx, entry);
} }
MenuEntry::Options(_, _, _) | MenuEntry::OptionsBar(_, _) MenuEntry::Options(_, _, _) | MenuEntry::OptionsBar(_, _)
if self.selected == idx && controller.trigger_left() => if (self.selected == idx && controller.trigger_left())
|| state.touch_controls.consume_click_in(left_entry_bounds) =>
{ {
state.sound_manager.play_sfx(1); state.sound_manager.play_sfx(1);
return MenuSelectionResult::Left(self.selected, entry, -1); return MenuSelectionResult::Left(self.selected, entry, -1);
} }
MenuEntry::Options(_, _, _) | MenuEntry::OptionsBar(_, _) MenuEntry::Options(_, _, _) | MenuEntry::OptionsBar(_, _)
if self.selected == idx && controller.trigger_right() => if (self.selected == idx && controller.trigger_right())
|| state.touch_controls.consume_click_in(right_entry_bounds) =>
{ {
state.sound_manager.play_sfx(1); state.sound_manager.play_sfx(1);
return MenuSelectionResult::Right(self.selected, entry, 1); return MenuSelectionResult::Right(self.selected, entry, 1);
} }
MenuEntry::DescriptiveOptions(_, _, _, _) MenuEntry::DescriptiveOptions(_, _, _, _)
if (self.selected == idx && controller.trigger_left()) if (self.selected == idx && controller.trigger_left())
|| state.touch_controls.consume_click_in(right_entry_bounds) => || state.touch_controls.consume_click_in(left_entry_bounds) =>
{ {
state.sound_manager.play_sfx(1); state.sound_manager.play_sfx(1);
return MenuSelectionResult::Left(self.selected, entry, -1); return MenuSelectionResult::Left(self.selected, entry, -1);
} }
MenuEntry::DescriptiveOptions(_, _, _, _) | MenuEntry::SaveData(_) MenuEntry::DescriptiveOptions(_, _, _, _) | MenuEntry::SaveData(_)
if self.selected == idx && controller.trigger_right() => if (self.selected == idx && controller.trigger_right())
|| state.touch_controls.consume_click_in(right_entry_bounds) =>
{ {
state.sound_manager.play_sfx(1); state.sound_manager.play_sfx(1);
return MenuSelectionResult::Right(self.selected, entry, 1); return MenuSelectionResult::Right(self.selected, entry, 1);