summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bridle <bridle.benjamin@gmail.com>2024-06-01 11:18:16 +1200
committerBen Bridle <bridle.benjamin@gmail.com>2024-06-01 11:18:16 +1200
commit76c1369ed95a9f1991a2fbaff2c9a073f7508689 (patch)
tree65a0c18f68078dec60d6e0fe6226bc0a5fb4f625
parent18e0c4228a68296ad2f1a6d3387837317d317126 (diff)
downloadbedrock-pc-76c1369ed95a9f1991a2fbaff2c9a073f7508689.zip
Simplify scroll value access code
-rw-r--r--src/devices/input.rs12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/devices/input.rs b/src/devices/input.rs
index 8e0bd34..462f569 100644
--- a/src/devices/input.rs
+++ b/src/devices/input.rs
@@ -49,8 +49,8 @@ impl InputDevice {
pointer_buttons: 0x00,
pointer_active: false,
- horizontal_scroll: 0x0000,
- vertical_scroll: 0x0000,
+ horizontal_scroll: 0x00,
+ vertical_scroll: 0x00,
horizontal_scroll_delta: 0.0,
vertical_scroll_delta: 0.0,
@@ -66,15 +66,11 @@ impl InputDevice {
}
pub fn read_horizontal_scroll(&mut self) -> u8 {
- let output_value = self.horizontal_scroll;
- self.horizontal_scroll = 0;
- return output_value as u8;
+ std::mem::take(&mut self.horizontal_scroll) as u8
}
pub fn read_vertical_scroll(&mut self) -> u8 {
- let output_value = self.vertical_scroll;
- self.vertical_scroll = 0;
- return output_value as u8;
+ std::mem::take(&mut self.vertical_scroll) as u8
}
pub fn on_pointer_button(&mut self, mask: u8, action: Action) {