From 7eece065b168aa813e2466ea7b360a3c91c6ad90 Mon Sep 17 00:00:00 2001
From: MathemanFlo <floh.heinrich@gmail.com>
Date: Fri, 22 Apr 2022 21:58:53 +0200
Subject: [PATCH] Preview layer shortcuts

---
 Sources/arm/ui/TabLayers.hx | 13 +++++++++++++
 Sources/arm/ui/UISidebar.hx |  1 +
 2 files changed, 14 insertions(+)

diff --git a/Sources/arm/ui/TabLayers.hx b/Sources/arm/ui/TabLayers.hx
index 4a7869b7..fce2924b 100644
--- a/Sources/arm/ui/TabLayers.hx
+++ b/Sources/arm/ui/TabLayers.hx
@@ -292,6 +292,19 @@ class TabLayers {
 
 			state = ui.image(icon, 0xffffffff, iconH);
 
+			var isTyping = ui.isTyping || UIView2D.inst.ui.isTyping || UINodes.inst.ui.isTyping;
+			if (!isTyping) {
+				if (i < 9 && Operator.shortcut(Config.keymap.select_layer, ShortcutDown)) {
+					var number = Std.string(i + 1) ;
+					var width = ui.ops.font.width(ui.fontSize, number) + 10;
+					var height = ui.ops.font.height(ui.fontSize);
+					ui.g.color = ui.t.TEXT_COL;
+					ui.g.fillRect(uix, uiy, width, height);
+					ui.g.color = ui.t.ACCENT_COL;
+					ui.g.drawString(number, uix + 5, uiy);
+				}
+			}
+
 			if (l.fill_layer == null && l.isMask()) {
 				ui.g.pipeline = null;
 			}
diff --git a/Sources/arm/ui/UISidebar.hx b/Sources/arm/ui/UISidebar.hx
index 2c24c5b7..fe659676 100644
--- a/Sources/arm/ui/UISidebar.hx
+++ b/Sources/arm/ui/UISidebar.hx
@@ -269,6 +269,7 @@ class UISidebar {
 				for (i in 1...10) if (kb.started(i + "")) Context.selectMaterial(i - 1);
 			}
 			else if (Operator.shortcut(Config.keymap.select_layer, ShortcutDown)) {
+				UISidebar.inst.hwnd0.redraws = 2;
 				for (i in 1...10) if (kb.started(i + "")) Context.selectLayer(i - 1);
 			}
 		}