Merge branch 'master' of https://github.com/VCVRack/Rack into 2017-10-bontric-midi-interface-revamp

src/widgets/ScrollWidget.cpp

@@ -36,18 +36,20 @@ void ScrollWidget::step() {
 }
 
 Widget *ScrollWidget::onMouseMove(Vec pos, Vec mouseRel) {
-	const float arrowSpeed = 50.0;
-	if (glfwGetKey(gWindow, GLFW_KEY_LEFT) == GLFW_PRESS) {
-		offset = offset.minus(Vec(1, 0).mult(arrowSpeed));
-	}
-	if (glfwGetKey(gWindow, GLFW_KEY_RIGHT) == GLFW_PRESS) {
-		offset = offset.minus(Vec(-1, 0).mult(arrowSpeed));
-	}
-	if (glfwGetKey(gWindow, GLFW_KEY_UP) == GLFW_PRESS) {
-		offset = offset.minus(Vec(0, 1).mult(arrowSpeed));
-	}
-	if (glfwGetKey(gWindow, GLFW_KEY_DOWN) == GLFW_PRESS) {
-		offset = offset.minus(Vec(0, -1).mult(arrowSpeed));
+	if (!gFocusedWidget) {
+		const float arrowSpeed = 50.0;
+		if (glfwGetKey(gWindow, GLFW_KEY_LEFT) == GLFW_PRESS) {
+			offset = offset.minus(Vec(1, 0).mult(arrowSpeed));
+		}
+		if (glfwGetKey(gWindow, GLFW_KEY_RIGHT) == GLFW_PRESS) {
+			offset = offset.minus(Vec(-1, 0).mult(arrowSpeed));
+		}
+		if (glfwGetKey(gWindow, GLFW_KEY_UP) == GLFW_PRESS) {
+			offset = offset.minus(Vec(0, 1).mult(arrowSpeed));
+		}
+		if (glfwGetKey(gWindow, GLFW_KEY_DOWN) == GLFW_PRESS) {
+			offset = offset.minus(Vec(0, -1).mult(arrowSpeed));
+		}
 	}
 	return OpaqueWidget::onMouseMove(pos, mouseRel);
 }