Change combo value via mouse wheel

armory3d · Jun 2, 2021 · 6d9a1ac · 6d9a1ac · MathemanFlo · Jun 2, 2021
1 parent b465561
commit 6d9a1ac
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Sources/zui/Zui.hx b/Sources/zui/Zui.hx
@@ -1274,12 +1274,16 @@ class Zui {
 		var distBottom = kha.System.windowHeight() - windowBorderBottom - (comboSelectedY + comboH );
 		var unrollUp = distBottom < 0 && distBottom < distTop;
 		beginRegion(globalG, comboSelectedX, comboSelectedY, comboSelectedW);
-		if (isKeyPressed) {
-			if (key == (unrollUp ? KeyCode.Down : KeyCode.Up) && comboToSubmit > 0) {
+		if (isKeyPressed || inputWheelDelta != 0) {
+			var arrowUp = isKeyPressed && key == (unrollUp ? KeyCode.Down : KeyCode.Up);
+			var arrowDown = isKeyPressed && key == (unrollUp ? KeyCode.Up : KeyCode.Down);
+			var wheelUp = (unrollUp && inputWheelDelta > 0) || (!unrollUp && inputWheelDelta < 0);
+			var wheelDown = (unrollUp && inputWheelDelta < 0) || (!unrollUp && inputWheelDelta > 0);
+			if ((arrowUp || wheelUp) && comboToSubmit > 0) {
 				comboToSubmit--;
 				submitComboHandle = comboSelectedHandle;
 			}
-			else if (key == (unrollUp ? KeyCode.Up : KeyCode.Down) && comboToSubmit < comboSelectedTexts.length - 1) {
+			else if ((arrowDown || wheelDown) && comboToSubmit < comboSelectedTexts.length - 1) {
 				comboToSubmit++;
 				submitComboHandle = comboSelectedHandle;
 			}