From bfa16b996baa49871a59298076c8189d02570c73 Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter@fuzzle.org>
Date: Sun, 3 Feb 2013 13:40:41 +0000
Subject: [PATCH] Tidy up UI

---
 ptap/ptapui.cpp | 117 +++++++++++++++++++++++++++++-------------------
 1 file changed, 72 insertions(+), 45 deletions(-)

diff --git a/ptap/ptapui.cpp b/ptap/ptapui.cpp
index 018dc15..ae8c229 100644
--- a/ptap/ptapui.cpp
+++ b/ptap/ptapui.cpp
@@ -52,59 +52,81 @@ struct PTapUI : PUi {
 void PTapUI::InitWidgets()
 {
 	widget = new Container();
-	widget->colour = Colour(0.6, 0.6, 0.6, 1.0);
+	widget->tex = this;
+	widget->back = true;
+	widget->colour = Colour(1, 1, 1, 1);
 	widget->w = this->width;
 	widget->h = this->height;
 
-	int padding = 3;
+	int padding = 4;
 
-	int c_w = (this->width * 0.5f);
-	int c_h = (this->height * 0.25f);
+	int c_w = (this->width - padding * 3) * 0.5f;
+	int c_h = (this->height - padding * 5) * 0.25f;
 
-	int slide_w = 25 + padding;
-	int slide_h = c_h - padding - padding;
+	int slide_w = 25;
+	int slide_h = c_h - 25;
 
 	for (int i = 0; i < TAPS + 2; i++) {
 		Container *c = new Container();
-		c->x = (i & 1) * c_w;
-		c->y = (i >> 1) * c_h;
+		c->x = (i & 1) * (c_w + padding) + padding;
+		c->y = (i >> 1) * (c_h + padding) + padding;
 		c->w = c_w;
 		c->h = c_h;
-
+/*
+		Container *c3 = new Container();
+		if (i >= TAPS) c3->colour = Colour(1, 1, 1, 0.2f);
+//		c3->colour = Colour(0, 0, 0, 0.2f);
+//		c3->x = c2->x + c2->w + padding;
+		c3->x = c->x;
+		c3->y = c->y + 25;
+		c3->w = slide_w * 2;
+		c3->h = slide_h;
+		c->children.push_back(c3);
+*/
 		Container *c2 = new Container();
+		if (i >= TAPS) c2->colour = Colour(1, 1, 1, 0.2f);
 		c2->x = c->x;
-		c2->y = c->y;
-		c2->w = slide_w * TAPS + padding * 2;
-		c2->h = c->h;
-		c2->Pad(padding, padding);
+//		c2->x = c3->x + c3->w + padding;
+		c2->y = c->y + 25;
+		c2->w = slide_w * TAPS;
+		c2->h = slide_h;
+		c->children.push_back(c2);
 
 		Container *c3 = new Container();
-		c3->colour = Colour(0, 0, 0, 0.2f);
-		c3->x = c2->x + c2->w;
-		c3->y = c->y;
-		c3->w = slide_w * 2 + padding * 2;
-		c3->h = c->h;
-		c3->Pad(padding, padding);
+		if (i >= TAPS) c3->colour = Colour(1, 1, 1, 0.2f);
+//		c3->colour = Colour(0, 0, 0, 0.2f);
+		c3->x = c2->x + c2->w + padding;
+		c3->y = c->y + 25;
+		c3->w = slide_w * 2;
+		c3->h = slide_h;
+		c->children.push_back(c3);
 
 		Container *c4 = new Container();
-		c4->x = c3->x + c3->w;
-		c4->y = c->y;
-		c4->w = c->w - (c4->x - c->x) + padding * 2;
-		c4->h = c->h;
-		c4->Pad(padding, padding);
+		if (i >= TAPS) c4->colour = Colour(1, 1, 1, 0.2f);
+		c4->x = c3->x + c3->w + padding;
+//		c4->x = c2->x + c2->w + padding;
+		c4->y = c->y + 25;
+		c4->w = slide_w;
+		c4->h = slide_h;
+		c->children.push_back(c4);
 
 		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);
+			} else {
+				slider->colour = Colour(.6f, .6f, .6f, 1);
+			}
 			slider->x = c2->x + j * slide_w;//(j & 1) * slide_w;
-			slider->y = c2->y + 10;// + (j >> 1) * slide_h;
+			slider->y = c2->y;// + (j >> 1) * slide_h;
 			slider->w = slide_w;
-			slider->h = slide_h - 10;
+			slider->h = c2->h;
 			slider->min = -1.f;
 			slider->max = 1.f;
 			slider->port = (i * 10) + 4 + j;
-			slider->Pad(padding, padding);
+//			slider->Pad(padding, padding);
 			c2->children.push_back(slider);
 		}
 
@@ -113,48 +135,53 @@ void PTapUI::InitWidgets()
 			slider->tex = this;
 			slider->big = false;
 			slider->x = c3->x + j * slide_w;//(j & 1) * slide_w;
-			slider->y = c3->y + 10;// + (j >> 1) * slide_h;
+			slider->y = c3->y;// + (j >> 1) * slide_h;
 			slider->w = slide_w;
-			slider->h = slide_h - 10;
+			slider->h = c3->h;
 			slider->min = -1.f;
 			slider->max = 1.f;
 			slider->port = (i * 10) + 4 + TAPS + j;
-			slider->Pad(padding, padding);
+//			slider->Pad(padding, padding);
 			c3->children.push_back(slider);
 		}
 
 		for (int j = 0; j < 1; j++) {
 			Slider *slider = new VSlider();
 			slider->tex = this;
-			slider->big = true;
+			slider->big = i >= TAPS;
+			slider->colour = Colour(1, .2f, .2f, 1);
 			slider->x = c4->x + j * slide_w;//(j & 1) * slide_w;
-			slider->y = c4->y + 10;// + (j >> 1) * slide_h;
+			slider->y = c4->y;// + (j >> 1) * slide_h;
 			slider->w = slide_w;
-			slider->h = slide_h - 10;
+			slider->h = c4->h;
 			slider->min = -1.f;
 			slider->max = 1.f;
 			slider->port = (i * 10) + 4 + TAPS + 2 + j;
-			slider->Pad(padding, padding);
+//			slider->Pad(padding, padding);
 			c4->children.push_back(slider);
 		}
 
 		if (i < TAPS) {
+			Container *c5 = new Container();
+			c5->x = c4->x + c4->w + padding;
+			c5->y = c->y + 25;
+			c5->w = c->w - (c5->x - c->x);
+			c5->h = slide_h;
+			c->children.push_back(c5);
+
 			Knob *k = new Knob();
 			k->tex = this;
-			k->x = c->x + (TAPS + 3) * slide_w;
-			k->y = c->y + 10;
-			k->w = c->w - (k->x - c->x);
-			k->h = c->h - 10;
+			k->x = c5->x;
+			k->y = c5->y;
+			k->w = c5->w;
+			k->h = c5->h;
 			k->min = 0.f;
 			k->max = 10.f;
 			k->port = (i * 10) + 4 + 9;
-			k->Pad(padding, padding);
-			c4->children.push_back(k);
+//			k->Pad(padding, padding);
+			c5->children.push_back(k);
 		}
 
-		c->children.push_back(c2);
-		c->children.push_back(c3);
-		c->children.push_back(c4);
 		this->widget->children.push_back(c);
 	}
 }
@@ -203,8 +230,8 @@ static LV2UI_Handle ptapui_instantiate(
 	PTapUI *pui = new PTapUI();
 	pui->write = write_function;
 	pui->controller = controller;
-	pui->width = 750;
-	pui->height = 500;
+	pui->width = 700;
+	pui->height = 660;
 	pui->exit = false;
 
 	pui->InitWidgets();