Pass PUi object as parameter of OnPaint instead of requiring to be during widget creation.

This commit is contained in:
2013-02-03 20:11:09 +00:00
parent 464856b95a
commit 35a44308d9
10 changed files with 35 additions and 43 deletions

View File

@@ -54,7 +54,6 @@ void PTapUI::InitWidgets()
scale = 1.0f;
widget = new Container();
widget->tex = this;
widget->back = true;
widget->colour = Colour(1, 1, 1, 1);
widget->w = this->width * scale;
@@ -115,7 +114,6 @@ void PTapUI::InitWidgets()
for (int j = 0; j < TAPS; j++) {
Slider *slider = new VSlider();
slider->tex = this;
slider->big = false;
if (i == j) {
slider->colour = Colour(.5f, .7f, 1, 1);
@@ -135,7 +133,6 @@ void PTapUI::InitWidgets()
for (int j = 0; j < 2; j++) {
Slider *slider = new VSlider();
slider->tex = this;
slider->big = false;
slider->x = c3->x + j * slide_w;//(j & 1) * slide_w;
slider->y = c3->y;// + (j >> 1) * slide_h;
@@ -150,7 +147,6 @@ void PTapUI::InitWidgets()
for (int j = 0; j < 1; j++) {
Slider *slider = new VSlider();
slider->tex = this;
slider->big = i >= TAPS;
slider->colour = Colour(1, .2f, .2f, 1);
slider->x = c4->x + j * slide_w;//(j & 1) * slide_w;
@@ -173,7 +169,6 @@ void PTapUI::InitWidgets()
c->children.push_back(c5);
Knob *k = new Knob();
k->tex = this;
k->x = c5->x;
k->y = c5->y;
k->w = c5->w;