From 01f6edc127137704355d697062f1c9a10af60594 Mon Sep 17 00:00:00 2001 From: thibaudk Date: Thu, 28 Nov 2024 23:33:24 +0000 Subject: [PATCH] [controller] set_color as integers + bugui update --- Hardware/3rdparty/bugui | 2 +- Hardware/Controller.cpp | 6 +++--- Hardware/Controller.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Hardware/3rdparty/bugui b/Hardware/3rdparty/bugui index da8232c..c71a9c1 160000 --- a/Hardware/3rdparty/bugui +++ b/Hardware/3rdparty/bugui @@ -1 +1 @@ -Subproject commit da8232c87e993f97e7cfc9efb23f87d0d32e0e8c +Subproject commit c71a9c1e02e3364a16edf3664ca6ef40898b9635 diff --git a/Hardware/Controller.cpp b/Hardware/Controller.cpp index fe69450..7096d50 100644 --- a/Hardware/Controller.cpp +++ b/Hardware/Controller.cpp @@ -109,19 +109,19 @@ void Controller::setup_scenario(Scenario::ProcessModel* s) [this] { update(); }); } -void Controller::on_interval_changed(const Scenario::IntervalModel &) +void Controller::on_interval_changed(const Scenario::IntervalModel&) { update(); } -void Controller::paint(bugui::painter &painter) +void Controller::paint(bugui::painter& painter) { if (!scenar) return; // Copied from MiniscenarioView auto& skin = Process::Style::instance(); const auto col = skin.IntervalBase().color(); - painter.set_color(col.redF(), col.greenF(), col.blackF(), col.alphaF()); + painter.set_color(col.red(), col.green(), col.black(), col.alpha()); for(const Scenario::IntervalModel& c : scenar->intervals) { diff --git a/Hardware/Controller.hpp b/Hardware/Controller.hpp index c1e06c3..8d4519c 100644 --- a/Hardware/Controller.hpp +++ b/Hardware/Controller.hpp @@ -24,7 +24,7 @@ public: private: Scenario::ProcessModel* scenar; - void on_interval_changed(const Scenario::IntervalModel &); + void on_interval_changed(const Scenario::IntervalModel&); }; }