edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Preview material shortcuts

Browse Source
This commit is contained in:
MathemanFlo
2022-04-22 21:58:24 +02:00
parent 381917f0e2
commit 0ff28693de
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/ui/TabMaterials.hx
+13
View File
@@ -84,6 +84,19 @@ class TabMaterials {
var uiy = ui._y;
var tile = ui.SCALE() > 1 ? 100 : 50;
var state = Project.materials[i].previewReady ? ui.image(img) : ui.image(Res.get("icons.k"), -1, null, tile, tile, tile, tile);
var isTyping = ui.isTyping || UIView2D.inst.ui.isTyping || UINodes.inst.ui.isTyping;
if (!isTyping) {
if (i < 9 && Operator.shortcut(Config.keymap.select_material, 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 (state == State.Started && ui.inputY > ui._windowY) {
if (Context.material != Project.materials[i]) {
Context.selectMaterial(i);
Sources/arm/ui/UISidebar.hx
+1
View File
@@ -265,6 +265,7 @@ class UISidebar {
var isTyping = ui.isTyping || UIView2D.inst.ui.isTyping || UINodes.inst.ui.isTyping;
if (!isTyping) {
if (Operator.shortcut(Config.keymap.select_material, ShortcutDown)) {
UISidebar.inst.hwnd1.redraws = 2;
for (i in 1...10) if (kb.started(i + "")) Context.selectMaterial(i - 1);
}
else if (Operator.shortcut(Config.keymap.select_layer, ShortcutDown)) {