bugui/score-addon-hardware
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

[bugui] wip on color

Browse source
This commit is contained in:
thibaud keller 2024-10-16 23:25:53 +01:00
parent 2d1d8ab1b0
commit 39f11ea247
3 changed files with 69 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Hardware/3rdparty/bugui vendored

@ -1 +1 @@
Subproject commit bb211f5b66f1775a1c2abd12b650fbaf486b8c86 Subproject commit 6e18b2d897e89ced5eb420aafe7c50f29026bfb6

131
Hardware/Controller.cpp
View file

@ -8,82 +8,82 @@
namespace Hardware namespace Hardware
{ {
Controller::Controller(const score::DocumentContext& doc) Controller::Controller(const score::DocumentContext& doc)
: bugui::controller{[&doc, this] : bugui::painter{[&doc, this]
(commands com, const bool& shift) (bugui::commands com, const bool& shift)
{ {
switch (com) switch (com)
{ {
case Play: case bugui::Play:
if (shift) if (shift)
doc.app.actions.action<Actions::PlayGlobal>().action()->trigger(); doc.app.actions.action<Actions::PlayGlobal>().action()->trigger();
else else
doc.app.actions.action<Actions::Play>().action()->trigger(); doc.app.actions.action<Actions::Play>().action()->trigger();
break; break;
case Stop: case bugui::Stop:
if (shift) if (shift)
doc.app.actions.action<Actions::Reinitialize>().action()->trigger(); doc.app.actions.action<Actions::Reinitialize>().action()->trigger();
else else
doc.app.actions.action<Actions::Stop>().action()->trigger(); doc.app.actions.action<Actions::Stop>().action()->trigger();
break; break;
case Up: case bugui::Up:
if (shift) if (shift)
{
v_zoom += .2;
draw_intervals();
}
else
{
v_ofset += .02;
draw_intervals();
}
break;
case Down:
if (shift)
{
if (v_zoom > .2)
{ {
v_zoom -= .2; v_zoom += .2;
draw_intervals(); draw_intervals();
} }
} else
else
{
v_ofset -= .02;
draw_intervals();
}
break;
case Left:
if (shift)
{
if (h_zoom > .02)
{ {
h_zoom -= .02; v_ofset += .02;
draw_intervals(); draw_intervals();
} }
} break;
else case bugui::Down:
{ if (shift)
if (h_ofset > 0)
{ {
h_ofset -= .02; if (v_zoom > .2)
{
v_zoom -= .2;
draw_intervals();
}
}
else
{
v_ofset -= .02;
draw_intervals(); draw_intervals();
} }
} break;
break; case bugui::Left:
case Right: if (shift)
if (shift) {
{ if (h_zoom > .02)
h_zoom += .02; {
draw_intervals(); h_zoom -= .02;
} draw_intervals();
else }
{ }
h_ofset += .02; else
draw_intervals(); {
} if (h_ofset > 0)
break; {
default: h_ofset -= .02;
break; 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; // qDebug() << "v_ofset: " << v_ofset;
@ -120,7 +120,8 @@ void Controller::draw_intervals()
// Copied from MiniscenarioView // Copied from MiniscenarioView
auto& skin = Process::Style::instance(); 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) for(const Scenario::IntervalModel& c : scenar->intervals)
{ {

4
Hardware/Controller.hpp
View file

@ -5,12 +5,12 @@
#include <Scenario/Document/Interval/IntervalModel.hpp> #include <Scenario/Document/Interval/IntervalModel.hpp>
#include <Scenario/Process/ScenarioModel.hpp> #include <Scenario/Process/ScenarioModel.hpp>
#include <controller.hpp> #include <painter.hpp>
namespace Hardware namespace Hardware
{ {
class SCORE_ADDON_HARDWARE_EXPORT Controller class SCORE_ADDON_HARDWARE_EXPORT Controller
: public bugui::controller : public bugui::painter
, public QObject , public QObject
{ {
W_OBJECT(Controller) W_OBJECT(Controller)