Merge pull request #31 from Froggy618157725/map_up_down_hotkey

Add Page Up/Down to scroll through map list
cohaereo · Jul 9, 2024 · 125b97d · 125b97d
2 parents a98af45 + 60c4483
commit 125b97d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,7 @@ received some polish!
 - Added a dim outline when hovering over nametags
 - Added a unit testing framework
     - Currently used for sanity testing various loaders like maps and activities
+- Added Page Up/Down to move up and down in the map list @Froggy618157725 in [#31](https://github.com/cohaereo/alkahest/pull/31)
 
 ### Changed
 

diff --git a/crates/alkahest/src/gui/hotkeys.rs b/crates/alkahest/src/gui/hotkeys.rs
@@ -35,6 +35,12 @@ pub const SHORTCUT_GAZE: egui::KeyboardShortcut =
 pub const SHORTCUT_MAP_SWAP: egui::KeyboardShortcut =
     egui::KeyboardShortcut::new(egui::Modifiers::NONE, egui::Key::I);
 
+    pub const SHORTCUT_MAP_PREV: egui::KeyboardShortcut =
+    egui::KeyboardShortcut::new(egui::Modifiers::NONE, egui::Key::PageUp);
+
+    pub const SHORTCUT_MAP_NEXT: egui::KeyboardShortcut =
+    egui::KeyboardShortcut::new(egui::Modifiers::NONE, egui::Key::PageDown);
+
 pub fn process_hotkeys(ctx: &egui::Context, resources: &mut Resources) {
     if ctx.input_mut(|i| i.consume_shortcut(&SHORTCUT_UNHIDE_ALL)) {
         unhide_all(resources);
@@ -55,6 +61,14 @@ pub fn process_hotkeys(ctx: &egui::Context, resources: &mut Resources) {
         }
     }
 
+    if ctx.input_mut(|i| i.consume_shortcut(&SHORTCUT_MAP_PREV)) {
+        resources.get_mut::<MapList>().set_current_map_prev(resources);
+    }
+
+    if ctx.input_mut(|i| i.consume_shortcut(&SHORTCUT_MAP_NEXT)) {
+        resources.get_mut::<MapList>().set_current_map_next(resources);
+    }
+
     if ctx.input_mut(|i| i.consume_shortcut(&SHORTCUT_GAZE)) {
         goto_gaze(resources);
     }

diff --git a/crates/alkahest/src/gui/menu/mod.rs b/crates/alkahest/src/gui/menu/mod.rs
@@ -286,12 +286,17 @@ impl MenuBar {
                             //     "Select 'Previous' Object"
                             // );
 
-                            control_section_title!(ui, "Miscellaneous");
+                            control_section_title!(ui, "Map Changing");
+
                             control_description!(
                                 ui,
                                 ICON_ALPHA_I_BOX_OUTLINE,
                                 "Swap to Previous Map"
                             );
+
+                            control_description!(ui, "Page Up", "Swap to Previous Map in List");
+
+                            control_description!(ui, "Page Down", "Swap to Next Map in List");
                         });
                 });
             });

diff --git a/crates/alkahest/src/maplist.rs b/crates/alkahest/src/maplist.rs
@@ -270,4 +270,16 @@ impl MapList {
             discord::set_activity_from_map(map);
         }
     }
+
+    pub fn set_current_map_next(&mut self, resources: &Resources) {
+        if self.current_map + 1 < self.maps.len() {
+            self.set_current_map(resources, self.current_map + 1)
+        }
+    }
+
+    pub fn set_current_map_prev(&mut self, resources: &Resources) {
+        if self.current_map > 0 && self.maps.len() >= 1 {
+            self.set_current_map(resources, self.current_map - 1)
+        }
+    }
 }