Use automatic widget packing.

master
Peter Nelson 2013-02-08 15:52:32 +00:00
parent de4987eee1
commit a72b7d37df
1 changed files with 5 additions and 16 deletions

View File

@ -91,9 +91,6 @@ void PTapUI::InitWidgets()
t->h = 25;
this->widget->Pack(t);
int slide_w = 25;
// int slide_h = c_h - 25;
for (int i = 0; i < NUM_TAPS + NUM_CHANNELS; i++) {
Container *c = new VBox();
if (i < NUM_TAPS) c->frame = Colour(0, 0, 0, .15f);
@ -114,14 +111,8 @@ void PTapUI::InitWidgets()
Container *c_taps = new HBox();
if (i >= NUM_TAPS) c_taps->colour = Colour(1, 1, 1, 0.15f);
c_taps->w = slide_w * NUM_TAPS;
c_strip->Pack(c_taps);
Container *c_ins = new HBox();
if (i >= NUM_TAPS) c_ins->colour = Colour(1, 1, 1, 0.15f);
c_ins->w = slide_w * NUM_CHANNELS;
c_strip->Pack(c_ins);
if (i < NUM_TAPS) {
snprintf(tmp, sizeof tmp, "Tap %d", i + 1);
} else {
@ -132,37 +123,35 @@ void PTapUI::InitWidgets()
Slider *slider = new VSlider();
strncpy(slider->group, tmp, sizeof slider->group);
snprintf(slider->label, sizeof slider->label, "%d", j + 1);
slider->big = false;
if (i == j) {
slider->colour = Colour(.5f, .7f, 1, 1);
} else {
slider->colour = Colour(.6f, .6f, .6f, 1);
}
slider->w = slide_w;
slider->min = -1.f;
slider->max = 1.f;
slider->port = TAP_MATRIX + i * NUM_GAINS + j;
c_taps->Pack(slider);
}
Container *c_ins = new HBox();
if (i >= NUM_TAPS) c_ins->colour = Colour(1, 1, 1, 0.15f);
c_strip->Pack(c_ins);
for (int j = 0; j < NUM_CHANNELS; j++) {
Slider *slider = new VSlider();
strncpy(slider->group, tmp, sizeof slider->group);
strncpy(slider->label, j == 0 ? "Left" : "Right", sizeof slider->label);
slider->big = false;
slider->w = slide_w;
slider->min = -1.f;
slider->max = 1.f;
slider->port = TAP_MATRIX + i * NUM_GAINS + NUM_TAPS + j;
c_ins->Pack(slider);
}
Slider *gain = new VSlider();
Slider *gain = new VSlider(i >= NUM_TAPS);
strncpy(gain->group, tmp, sizeof gain->group);
strncpy(gain->label, "Gain", sizeof gain->label);
gain->big = i >= NUM_TAPS;
gain->colour = Colour(1, .2f, .2f, 1);
gain->w = slide_w;
gain->min = -1.f;
gain->max = 1.f;
gain->port = TAP_GAINS + i;