From e1c2dbc104a825ad1383962d2e3171d358399cb2 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Sun, 18 Mar 2018 00:08:46 -0400
Subject: [PATCH] Fix lastPath, lights WIP

---
 src/app/MultiLightWidget.cpp | 3 +--
 src/app/RackWidget.cpp       | 3 ++-
 src/bridge.cpp               | 2 +-
 src/window.cpp               | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/MultiLightWidget.cpp b/src/app/MultiLightWidget.cpp
index f6249ab6..b91e9d17 100644
--- a/src/app/MultiLightWidget.cpp
+++ b/src/app/MultiLightWidget.cpp
@@ -11,10 +11,9 @@ void MultiLightWidget::addBaseColor(NVGcolor baseColor) {
 
 void MultiLightWidget::setValues(const std::vector<float> &values) {
 	assert(values.size() == baseColors.size());
-	color = bgColor;
+	color = nvgRGBf(0, 0, 0);
 	for (size_t i = 0; i < baseColors.size(); i++) {
 		NVGcolor c = baseColors[i];
-		c = colorMinus(c, bgColor);
 		c = colorMult(c, values[i]);
 		color = colorPlus(color, c);
 	}
diff --git a/src/app/RackWidget.cpp b/src/app/RackWidget.cpp
index 38c60dc5..f9e3917d 100644
--- a/src/app/RackWidget.cpp
+++ b/src/app/RackWidget.cpp
@@ -55,7 +55,6 @@ void RackWidget::clear() {
 	wireContainer->activeWire = NULL;
 	wireContainer->clearChildren();
 	moduleContainer->clearChildren();
-	lastPath = "";
 
 	gRackScene->scrollWidget->offset = Vec(0, 0);
 }
@@ -63,7 +62,9 @@ void RackWidget::clear() {
 void RackWidget::reset() {
 	if (osdialog_message(OSDIALOG_INFO, OSDIALOG_OK_CANCEL, "Clear your patch and start over?")) {
 		clear();
+		// Fails silently if file does not exist
 		loadPatch(assetLocal("template.vcv"));
+		lastPath = "";
 	}
 }
 
diff --git a/src/bridge.cpp b/src/bridge.cpp
index ee9c0aaf..da99c56a 100644
--- a/src/bridge.cpp
+++ b/src/bridge.cpp
@@ -392,7 +392,7 @@ static void serverRun() {
 		int client = accept(server, NULL, NULL);
 		if (client < 0) {
 			// Wait a bit before attempting to accept another client
-			std::this_thread::sleep_for(std::chrono::duration<float>(0.1));
+			std::this_thread::sleep_for(std::chrono::duration<double>(0.1));
 			continue;
 		}
 
diff --git a/src/window.cpp b/src/window.cpp
index 6cebbff1..d7b24119 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -547,9 +547,9 @@ void windowSetTheme(NVGcolor bg, NVGcolor fg) {
 	// Assume dark background and light foreground
 
 	BNDwidgetTheme w;
-	w.outlineColor = colorMinus(bg, nvgRGB(0x10, 0x10, 0x10));
+	w.outlineColor = bg;
 	w.itemColor = fg;
-	w.innerColor = colorMinus(bg, nvgRGB(0x10, 0x10, 0x10));
+	w.innerColor = bg;
 	w.innerSelectedColor = colorPlus(bg, nvgRGB(0x30, 0x30, 0x30));
 	w.textColor = fg;
 	w.textSelectedColor = fg;
@@ -571,7 +571,7 @@ void windowSetTheme(NVGcolor bg, NVGcolor fg) {
 	t.menuTheme = w;
 	t.menuItemTheme = w;
 
-	t.sliderTheme.itemColor = colorMinus(bg, nvgRGB(0x10, 0x10, 0x10));
+	t.sliderTheme.itemColor = bg;
 	t.sliderTheme.innerColor = colorPlus(bg, nvgRGB(0x50, 0x50, 0x50));
 	t.sliderTheme.innerSelectedColor = colorPlus(bg, nvgRGB(0x60, 0x60, 0x60));
 
@@ -581,6 +581,7 @@ void windowSetTheme(NVGcolor bg, NVGcolor fg) {
 	t.scrollBarTheme.itemColor = colorPlus(bg, nvgRGB(0x50, 0x50, 0x50));
 	t.scrollBarTheme.innerColor = bg;
 
+	t.menuTheme.innerColor = colorMinus(bg, nvgRGB(0x10, 0x10, 0x10));
 	t.menuTheme.textColor = colorMinus(fg, nvgRGB(0x50, 0x50, 0x50));
 	t.menuTheme.textSelectedColor = t.menuTheme.textColor;