From 39f11ea2472c9e0c1b131afb844d0ae16b8b6bcc Mon Sep 17 00:00:00 2001
From: thibaudk <thibaud.keller@aquilenet.fr>
Date: Wed, 16 Oct 2024 23:25:53 +0100
Subject: [PATCH] [bugui] wip on color

---
 Hardware/3rdparty/bugui |   2 +-
 Hardware/Controller.cpp | 131 ++++++++++++++++++++--------------------
 Hardware/Controller.hpp |   4 +-
 3 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/Hardware/3rdparty/bugui b/Hardware/3rdparty/bugui
index bb211f5..6e18b2d 160000
--- a/Hardware/3rdparty/bugui
+++ b/Hardware/3rdparty/bugui
@@ -1 +1 @@
-Subproject commit bb211f5b66f1775a1c2abd12b650fbaf486b8c86
+Subproject commit 6e18b2d897e89ced5eb420aafe7c50f29026bfb6
diff --git a/Hardware/Controller.cpp b/Hardware/Controller.cpp
index cd186e9..b203d91 100644
--- a/Hardware/Controller.cpp
+++ b/Hardware/Controller.cpp
@@ -8,82 +8,82 @@
 namespace Hardware
 {
 Controller::Controller(const score::DocumentContext& doc)
-    : bugui::controller{[&doc, this]
-                        (commands com, const bool& shift)
+    : bugui::painter{[&doc, this]
+                     (bugui::commands com, const bool& shift)
   {
     switch (com)
     {
-    case Play:
-      if (shift)
-        doc.app.actions.action<Actions::PlayGlobal>().action()->trigger();
-      else
-        doc.app.actions.action<Actions::Play>().action()->trigger();
-      break;
-    case Stop:
-      if (shift)
-        doc.app.actions.action<Actions::Reinitialize>().action()->trigger();
-      else
-        doc.app.actions.action<Actions::Stop>().action()->trigger();
-      break;
-    case Up:
-      if (shift)
-      {
-        v_zoom += .2;
-        draw_intervals();
-      }
-      else
-      {
-        v_ofset += .02;
-        draw_intervals();
-      }
-      break;
-    case Down:
-      if (shift)
-      {
-        if (v_zoom > .2)
+      case bugui::Play:
+        if (shift)
+          doc.app.actions.action<Actions::PlayGlobal>().action()->trigger();
+        else
+          doc.app.actions.action<Actions::Play>().action()->trigger();
+        break;
+      case bugui::Stop:
+        if (shift)
+          doc.app.actions.action<Actions::Reinitialize>().action()->trigger();
+        else
+          doc.app.actions.action<Actions::Stop>().action()->trigger();
+        break;
+      case bugui::Up:
+        if (shift)
         {
-          v_zoom -= .2;
+          v_zoom += .2;
           draw_intervals();
         }
-      }
-      else
-      {
-        v_ofset -= .02;
-        draw_intervals();
-      }
-      break;
-    case Left:
-      if (shift)
-      {
-        if (h_zoom > .02)
+        else
         {
-          h_zoom -= .02;
+          v_ofset += .02;
           draw_intervals();
         }
-      }
-      else
-      {
-        if (h_ofset > 0)
+        break;
+      case bugui::Down:
+        if (shift)
         {
-          h_ofset -= .02;
+          if (v_zoom > .2)
+          {
+            v_zoom -= .2;
+            draw_intervals();
+          }
+        }
+        else
+        {
+          v_ofset -= .02;
           draw_intervals();
         }
-      }
-      break;
-    case Right:
-      if (shift)
-      {
-        h_zoom += .02;
-        draw_intervals();
-      }
-      else
-      {
-        h_ofset += .02;
-        draw_intervals();
-      }
-      break;
-    default:
-      break;
+        break;
+      case bugui::Left:
+        if (shift)
+        {
+          if (h_zoom > .02)
+          {
+            h_zoom -= .02;
+            draw_intervals();
+          }
+        }
+        else
+        {
+          if (h_ofset > 0)
+          {
+            h_ofset -= .02;
+            draw_intervals();
+          }
+        }
+        break;
+      case bugui::Right:
+        if (shift)
+        {
+          h_zoom += .02;
+          draw_intervals();
+        }
+        else
+        {
+          h_ofset += .02;
+          draw_intervals();
+        }
+        break;
+      default:
+        break;
     }
 
       // qDebug() << "v_ofset: " << v_ofset;
@@ -120,7 +120,8 @@ void Controller::draw_intervals()
 
   // Copied from MiniscenarioView
   auto& skin = Process::Style::instance();
-  // set_stroke_color();
+  const auto col = skin.IntervalBase().color();
+  set_color(col.redF(), col.greenF(), col.blackF(), col.alphaF());
 
   for(const Scenario::IntervalModel& c : scenar->intervals)
   {
diff --git a/Hardware/Controller.hpp b/Hardware/Controller.hpp
index 507eb02..1e69aa6 100644
--- a/Hardware/Controller.hpp
+++ b/Hardware/Controller.hpp
@@ -5,12 +5,12 @@
 #include <Scenario/Document/Interval/IntervalModel.hpp>
 #include <Scenario/Process/ScenarioModel.hpp>
 
-#include <controller.hpp>
+#include <painter.hpp>
 
 namespace Hardware
 {
 class SCORE_ADDON_HARDWARE_EXPORT Controller
-    : public bugui::controller
+    : public bugui::painter
     , public QObject
 {
   W_OBJECT(Controller)