Extract canvas toolbar state planning

src/app.cpp

@@ -6,6 +6,7 @@
 #include "node_progress_bar.h"
 #include "mp4enc.h"
 #include "app_core/app_status.h"
+#include "app_core/canvas_tool_ui.h"
 #include "app_core/document_recording.h"
 #include "app_core/document_route.h"
 #include "app_core/document_session.h"
@@ -36,6 +37,36 @@ void enable_opengl_state(std::uint32_t state) noexcept
     glEnable(static_cast<GLenum>(state));
 }
 
+pp::app::CanvasToolMode canvas_tool_mode_from_canvas_mode(kCanvasMode mode) noexcept
+{
+    switch (mode) {
+    case kCanvasMode::Draw:
+        return pp::app::CanvasToolMode::draw;
+    case kCanvasMode::Erase:
+        return pp::app::CanvasToolMode::erase;
+    case kCanvasMode::Line:
+        return pp::app::CanvasToolMode::line;
+    case kCanvasMode::Camera:
+        return pp::app::CanvasToolMode::camera;
+    case kCanvasMode::Grid:
+        return pp::app::CanvasToolMode::grid;
+    case kCanvasMode::Copy:
+        return pp::app::CanvasToolMode::copy;
+    case kCanvasMode::Cut:
+        return pp::app::CanvasToolMode::cut;
+    case kCanvasMode::Fill:
+        return pp::app::CanvasToolMode::fill;
+    case kCanvasMode::MaskFree:
+        return pp::app::CanvasToolMode::mask_free;
+    case kCanvasMode::MaskLine:
+        return pp::app::CanvasToolMode::mask_line;
+    case kCanvasMode::FloodFill:
+        return pp::app::CanvasToolMode::flood_fill;
+    default:
+        return pp::app::CanvasToolMode::draw;
+    }
+}
+
 void disable_opengl_state(std::uint32_t state) noexcept
 {
     glDisable(static_cast<GLenum>(state));
@@ -631,25 +662,26 @@ void App::update(float dt)
         main->update(width, height, zoom);
 
     {
-        static glm::vec4 color_button_normal{ .1, .1, .1, 1 };
-        static glm::vec4 color_button_hlight{ 1, .0, .0, 1 };
-
         auto mode = Canvas::I->m_current_mode;
 
         CanvasModePen* pm = (CanvasModePen*)canvas->m_canvas->modes[(int)kCanvasMode::Draw][0];
-        layout[main_id]->find<NodeButtonCustom>("btn-pick")->set_active(mode == kCanvasMode::Draw && pm->m_picking);
-        layout[main_id]->find<NodeButtonCustom>("btn-touchlock")->set_active(canvas->m_canvas->m_touch_lock);
+        const auto toolbar = pp::app::plan_canvas_tool_button_state(
+            canvas_tool_mode_from_canvas_mode(mode),
+            pm && pm->m_picking,
+            canvas->m_canvas->m_touch_lock);
+        layout[main_id]->find<NodeButtonCustom>("btn-pick")->set_active(toolbar.pick_active);
+        layout[main_id]->find<NodeButtonCustom>("btn-touchlock")->set_active(toolbar.touch_lock_active);
 
-        layout[main_id]->find<NodeButtonCustom>("btn-pen")->set_active(mode == kCanvasMode::Draw);
-        layout[main_id]->find<NodeButtonCustom>("btn-erase")->set_active(mode == kCanvasMode::Erase);
-        layout[main_id]->find<NodeButton>("btn-cam")->set_active(mode == kCanvasMode::Camera);
-        layout[main_id]->find<NodeButtonCustom>("btn-line")->set_active(mode == kCanvasMode::Line);
-        layout[main_id]->find<NodeButton>("btn-grid")->set_active(mode == kCanvasMode::Grid);
-        layout[main_id]->find<NodeButton>("btn-copy")->set_active(mode == kCanvasMode::Copy);
-        layout[main_id]->find<NodeButton>("btn-cut")->set_active(mode == kCanvasMode::Cut);
-        layout[main_id]->find<NodeButtonCustom>("btn-mask-free")->set_active(mode == kCanvasMode::MaskFree);
-        layout[main_id]->find<NodeButtonCustom>("btn-mask-line")->set_active(mode == kCanvasMode::MaskLine);
-        layout[main_id]->find<NodeButtonCustom>("btn-bucket")->set_active(mode == kCanvasMode::FloodFill);
+        layout[main_id]->find<NodeButtonCustom>("btn-pen")->set_active(toolbar.pen_active);
+        layout[main_id]->find<NodeButtonCustom>("btn-erase")->set_active(toolbar.erase_active);
+        layout[main_id]->find<NodeButton>("btn-cam")->set_active(toolbar.camera_active);
+        layout[main_id]->find<NodeButtonCustom>("btn-line")->set_active(toolbar.line_active);
+        layout[main_id]->find<NodeButton>("btn-grid")->set_active(toolbar.grid_active);
+        layout[main_id]->find<NodeButton>("btn-copy")->set_active(toolbar.copy_active);
+        layout[main_id]->find<NodeButton>("btn-cut")->set_active(toolbar.cut_active);
+        layout[main_id]->find<NodeButtonCustom>("btn-mask-free")->set_active(toolbar.mask_free_active);
+        layout[main_id]->find<NodeButtonCustom>("btn-mask-line")->set_active(toolbar.mask_line_active);
+        layout[main_id]->find<NodeButtonCustom>("btn-bucket")->set_active(toolbar.flood_fill_active);
     }
 }
 

src/app_core/canvas_tool_ui.h

@@ -42,6 +42,23 @@ struct CanvasToolPlan {
     bool no_op = false;
 };
 
+struct CanvasToolButtonState {
+    CanvasToolMode mode = CanvasToolMode::draw;
+    bool pick_active = false;
+    bool touch_lock_active = false;
+    bool pen_active = false;
+    bool erase_active = false;
+    bool line_active = false;
+    bool camera_active = false;
+    bool grid_active = false;
+    bool copy_active = false;
+    bool cut_active = false;
+    bool fill_active = false;
+    bool mask_free_active = false;
+    bool mask_line_active = false;
+    bool flood_fill_active = false;
+};
+
 [[nodiscard]] inline constexpr CanvasToolTransformAction transform_action_for_mode(CanvasToolMode mode) noexcept
 {
     if (mode == CanvasToolMode::copy) {
@@ -83,4 +100,27 @@ struct CanvasToolPlan {
     return plan;
 }
 
+[[nodiscard]] inline constexpr CanvasToolButtonState plan_canvas_tool_button_state(
+    CanvasToolMode mode,
+    bool picking,
+    bool touch_lock) noexcept
+{
+    CanvasToolButtonState state;
+    state.mode = mode;
+    state.pick_active = mode == CanvasToolMode::draw && picking;
+    state.touch_lock_active = touch_lock;
+    state.pen_active = mode == CanvasToolMode::draw;
+    state.erase_active = mode == CanvasToolMode::erase;
+    state.line_active = mode == CanvasToolMode::line;
+    state.camera_active = mode == CanvasToolMode::camera;
+    state.grid_active = mode == CanvasToolMode::grid;
+    state.copy_active = mode == CanvasToolMode::copy;
+    state.cut_active = mode == CanvasToolMode::cut;
+    state.fill_active = mode == CanvasToolMode::fill;
+    state.mask_free_active = mode == CanvasToolMode::mask_free;
+    state.mask_line_active = mode == CanvasToolMode::mask_line;
+    state.flood_fill_active = mode == CanvasToolMode::flood_fill;
+    return state;
+}
+
 } // namespace pp::app