summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2013-03-10 13:52:59 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2013-03-10 13:52:59 +0100
commit1ad5ab05bdd4a5d66370426c09d8d09c2ba39943 (patch)
tree9574bf53f80d435f56b2e0cac9060a57e0eb7d9c
parent5aad0006b4cf04f3accd29912ca11312b65858dc (diff)
Work a little on knob design and knob/checkbox positions.
-rw-r--r--plugingui/knob.cc3
-rw-r--r--plugingui/plugingui.cc10
2 files changed, 7 insertions, 6 deletions
diff --git a/plugingui/knob.cc b/plugingui/knob.cc
index d36fb6f..a80e325 100644
--- a/plugingui/knob.cc
+++ b/plugingui/knob.cc
@@ -170,9 +170,10 @@ void GUI::Knob::repaintEvent(GUI::RepaintEvent *e)
p.drawText(center_x - font.textWidth(buf) / 2,
center_y + font.textHeight(buf) / 2, font, buf);
- p.setColour(Colour(0.5, 0.5, 1, alpha));
+ p.setColour(Colour(1, alpha));
p.drawCircle(center_x, center_y, radius);
+ p.drawCircle(center_x, center_y, radius - 1);
double padval = val * 0.8 + 0.1;
double border_x = sin((-1 * padval + 1) * 2 * M_PI);
diff --git a/plugingui/plugingui.cc b/plugingui/plugingui.cc
index 9ff8ccd..7ed31a1 100644
--- a/plugingui/plugingui.cc
+++ b/plugingui/plugingui.cc
@@ -179,7 +179,7 @@ void PluginGUI::init()
// Enable Velocity
check = new GUI::CheckBox(window);
check->setText("Enable Velocity Modifier");
- check->move(82,82);
+ check->move(210,82);
check->resize(200,16);
check->setChecked(Conf::enable_velocity_modifier);
check->registerClickHandler(checkClick, this);
@@ -189,11 +189,11 @@ void PluginGUI::init()
int xpos = 180;
GUI::Label *lbl_weight = new GUI::Label(window);
lbl_weight->setText("Weight Modifier");
- lbl_weight->move(xpos, 138);
+ lbl_weight->move(xpos, 138 + 15);
lbl_weight->resize(100, 20);
knob = new GUI::Knob(window);
- knob->move(xpos + 30, 100);
+ knob->move(xpos + 30, 100 + 15);
knob->resize(41, 41);
knob->setValue(Conf::velocity_modifier_weight);
knob->registerClickHandler(knobChange, this);
@@ -204,11 +204,11 @@ void PluginGUI::init()
int xpos = 300;
GUI::Label *lbl_falloff = new GUI::Label(window);
lbl_falloff->setText("Falloff Modifier");
- lbl_falloff->move(xpos, 138);
+ lbl_falloff->move(xpos, 138 + 15);
lbl_falloff->resize(100, 20);
knob2 = new GUI::Knob(window);
- knob2->move(xpos + 30, 100);
+ knob2->move(xpos + 30, 100 + 15);
knob2->resize(41, 41);
knob2->setValue(Conf::velocity_modifier_falloff);
knob2->registerClickHandler(knobChange2, this);