From cf0cbe3fd28b2099b580edc1714b4d68bf7183cd Mon Sep 17 00:00:00 2001
From: Arne Dußin
Date: Fri, 20 Nov 2020 20:00:28 +0100
Subject: Add simple tool sidebar gui

---
 src/tool/room_tool.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/tool/room_tool.rs')

diff --git a/src/tool/room_tool.rs b/src/tool/room_tool.rs
index 3416596..c4a8b8c 100644
--- a/src/tool/room_tool.rs
+++ b/src/tool/room_tool.rs
@@ -35,7 +35,13 @@ impl Tool for RoomTool {
         self.dimension_indicator.clear_dimensions();
     }
 
-    fn active_update(&mut self, map_data: &mut MapData, rl: &RaylibHandle, transform: &Transform) {
+    fn active_update(
+        &mut self,
+        map_data: &mut MapData,
+        rl: &RaylibHandle,
+        transform: &Transform,
+        mouse_blocked: bool,
+    ) {
         let mouse_pos_m = transform.point_px_to_m(rl.get_mouse_position().into());
         // Update the currently drawn rectangle, if it exists, and also its dimension indicator.
         if let Some((ref pos1, ref mut pos2)) = &mut self.unfinished_rect {
@@ -45,16 +51,18 @@ impl Tool for RoomTool {
         }
 
         // Start or finish drawing the currently unfinished rectangle
-        if self.keybindings.finish_draw.is_pressed(rl) && self.unfinished_rect.is_some() {
+        if self.keybindings.finish_draw.is_pressed(rl, mouse_blocked)
+            && self.unfinished_rect.is_some()
+        {
             let (pos1, pos2) = self.unfinished_rect.take().unwrap();
             self.dimension_indicator.clear_dimensions();
             map_data.rooms_mut().push(Rect::bounding_rect(pos1, pos2));
-        } else if self.keybindings.start_draw.is_pressed(rl) {
+        } else if self.keybindings.start_draw.is_pressed(rl, mouse_blocked) {
             let snapped_mouse_pos = snap_to_grid(mouse_pos_m, SNAP_SIZE);
             self.unfinished_rect = Some((snapped_mouse_pos, snapped_mouse_pos))
         }
 
-        if self.keybindings.abort_draw.is_pressed(rl) {
+        if self.keybindings.abort_draw.is_pressed(rl, false) {
             self.unfinished_rect = None;
         }
     }
-- 
cgit v1.2.3-70-g09d2