housekeeping and todos

src/app/gui/canvas.cc

@@ -78,7 +78,7 @@ void Canvas::DrawBackground(ImVec2 canvas_size, bool can_drag) {
       ImVec2(canvas_sz_.x * global_scale_, canvas_sz_.y * global_scale_);
   ImGui::InvisibleButton("canvas", scaled_sz, kMouseFlags);
 
-  if (can_drag) {
+  if (draggable_ && ImGui::IsItemHovered()) {
     const bool is_active = ImGui::IsItemActive();  // Held
     const ImVec2 origin(canvas_p0_.x + scrolling_.x,
                         canvas_p0_.y + scrolling_.y);  // Lock scrolled origin
@@ -87,8 +87,9 @@ void Canvas::DrawBackground(ImVec2 canvas_size, bool can_drag) {
     // Pan (we use a zero mouse threshold when there's no context menu)
     if (const float mouse_threshold_for_pan =
             enable_context_menu_ ? -1.0f : 0.0f;
-        is_active && ImGui::IsMouseDragging(ImGuiMouseButton_Right,
-                                            mouse_threshold_for_pan)) {
+        is_active &&
+        ImGui::IsMouseDragging(ImGuiMouseButton_Right,
+                               mouse_threshold_for_pan)) {
       scrolling_.x += io.MouseDelta.x;
       scrolling_.y += io.MouseDelta.y;
     }
@@ -110,12 +111,12 @@ void Canvas::DrawContextMenu() {
 
   // Contents of the Context Menu
   if (ImGui::BeginPopup("context")) {
-    ImGui::MenuItem("Show Grid", nullptr, &enable_grid_);
-    ImGui::Selectable("Show Labels", &enable_hex_tile_labels_);
     if (ImGui::MenuItem("Reset Position", nullptr, false)) {
       scrolling_.x = 0;
       scrolling_.y = 0;
     }
+    ImGui::MenuItem("Show Grid", nullptr, &enable_grid_);
+    ImGui::Selectable("Show Labels", &enable_hex_tile_labels_);
     if (ImGui::BeginMenu("Canvas Properties")) {
       ImGui::Text("Canvas Size: %.0f x %.0f", canvas_sz_.x, canvas_sz_.y);
       ImGui::Text("Global Scale: %.1f", global_scale_);
@@ -193,9 +194,7 @@ bool Canvas::DrawTilePainter(const Bitmap &bitmap, int size, float scale) {
     if (ImGui::IsMouseClicked(ImGuiMouseButton_Left)) {
       // Draw the currently selected tile on the overworld here
       // Save the coordinates of the selected tile.
-      drawn_tile_pos_ = io.MousePos;
-      SDL_Log("Drawn tile position: %.0f, %.0f", drawn_tile_pos_.x,
-              drawn_tile_pos_.y);
+      drawn_tile_pos_ = painter_pos;
       return true;
     }
 

src/app/gui/canvas.h

@@ -142,15 +142,17 @@ class Canvas {
     int num_rows = height() / custom_step_;
     int tile_id = (x / custom_step_) + (y / custom_step_) * num_columns;
     if (tile_id >= num_columns * num_rows) {
-      tile_id = -1; // Invalid tile ID
+      tile_id = -1;  // Invalid tile ID
     }
     return tile_id;
   }
 
   auto set_current_labels(int i) { current_labels_ = i; }
   auto set_highlight_tile_id(int i) { highlight_tile_id = i; }
+  auto set_draggable(bool value) { draggable_ = value; }
 
  private:
+  bool draggable_ = false;
   bool enable_grid_ = true;
   bool enable_hex_tile_labels_ = false;
   bool enable_custom_labels_ = false;

src/app/gui/input.cc

@@ -45,7 +45,9 @@ bool InputScalarLeft(const char* label, ImGuiDataType data_type, void* p_data,
       value_changed = DataTypeApplyFromText(buf, data_type, p_data, format);
   } else {
     const float button_size = GetFrameHeight();
-
+    ImGui::AlignTextToFramePadding();
+    ImGui::Text("%s", label);
+    ImGui::SameLine();
     BeginGroup();  // The only purpose of the group here is to allow the caller
                    // to query item data e.g. IsItemActive()
     PushID(label);
@@ -57,9 +59,7 @@ bool InputScalarLeft(const char* label, ImGuiDataType data_type, void* p_data,
                         ImVec2{style.ItemSpacing.x, style.ItemSpacing.y});
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,
                         ImVec2{style.FramePadding.x, style.FramePadding.y});
-    ImGui::AlignTextToFramePadding();
-    ImGui::Text("%s", label);
-    ImGui::SameLine();
+
     ImGui::SetNextItemWidth(input_width);
     if (InputText("", buf, IM_ARRAYSIZE(buf),
                   flags))  // PushId(label) + "" gives us the expected ID