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

Implement show asset names option for all assets

Browse Source
This commit is contained in:
luboslenco
2021-01-20 21:35:05 +01:00
parent 1c5e1fb7b1
commit a04cfae4a6
4 changed files with 61 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/ui/TabBrushes.hx
+17 -3
View File
@@ -38,16 +38,19 @@ class TabBrushes {
var num = Std.int(Config.raw.layout[LayoutSidebarW] / slotw);
for (row in 0...Std.int(Math.ceil(Project.brushes.length / num))) {
ui.row([for (i in 0...num) 1 / num]);
var mult = Config.raw.show_asset_names ? 2 : 1;
ui.row([for (i in 0...num * mult) 1 / num]);
ui._x += 2;
if (row > 0) ui._y += 6;
var off = Config.raw.show_asset_names ? ui.ELEMENT_OFFSET() * 10.0 : 6;
if (row > 0) ui._y += off;
for (j in 0...num) {
var imgw = Std.int(50 * ui.SCALE());
var i = j + row * num;
if (i >= Project.brushes.length) {
@:privateAccess ui.endElement(imgw);
if (Config.raw.show_asset_names) @:privateAccess ui.endElement(0);
continue;
}
var img = ui.SCALE() > 1 ? Project.brushes[i].image : Project.brushes[i].imageIcon;
@@ -64,7 +67,7 @@ class TabBrushes {
ui.fill(w + 1, -2, 2, w + 4, ui.t.HIGHLIGHT_COL);
}
//var uix = ui._x;
var uix = ui._x;
//var uiy = ui._y;
var tile = ui.SCALE() > 1 ? 100 : 50;
var state = Project.brushes[i].previewReady ? ui.image(img) : ui.image(Res.get("icons.k"), -1, null, tile * 5, tile, tile, tile);
@@ -112,6 +115,17 @@ class TabBrushes {
}, 3 + add);
}
if (ui.isHovered && imgFull != null) ui.tooltipImage(imgFull);
if (Config.raw.show_asset_names) {
ui._x = uix;
ui._y += slotw * 0.9;
ui.text(Project.brushes[i].canvas.name, Center);
if (ui.isHovered) ui.tooltip(Project.brushes[i].canvas.name);
ui._y -= slotw * 0.9;
if (i == Project.brushes.length - 1) {
ui._y += j == num - 1 ? imgw : imgw + ui.ELEMENT_H() + ui.ELEMENT_OFFSET();
}
}
}
ui._y += 6;
Sources/arm/ui/TabFonts.hx
+17 -2
View File
@@ -29,16 +29,19 @@ class TabFonts {
var num = Std.int(Config.raw.layout[LayoutSidebarW] / slotw);
for (row in 0...Std.int(Math.ceil(Project.fonts.length / num))) {
ui.row([for (i in 0...num) 1 / num]);
var mult = Config.raw.show_asset_names ? 2 : 1;
ui.row([for (i in 0...num * mult) 1 / num]);
ui._x += 2;
if (row > 0) ui._y += 6;
var off = Config.raw.show_asset_names ? ui.ELEMENT_OFFSET() * 10.0 : 6;
if (row > 0) ui._y += off;
for (j in 0...num) {
var imgw = Std.int(50 * ui.SCALE());
var i = j + row * num;
if (i >= Project.fonts.length) {
@:privateAccess ui.endElement(imgw);
if (Config.raw.show_asset_names) @:privateAccess ui.endElement(0);
continue;
}
var img = Project.fonts[i].image;
@@ -54,6 +57,7 @@ class TabFonts {
ui.fill(w + 1, -2, 2, w + 4, ui.t.HIGHLIGHT_COL);
}
var uix = ui._x;
var tile = ui.SCALE() > 1 ? 100 : 50;
var state = State.Idle;
if (Project.fonts[i].previewReady) {
@@ -97,6 +101,17 @@ class TabFonts {
}, 1 + add);
}
if (ui.isHovered && img != null) ui.tooltipImage(img);
if (Config.raw.show_asset_names) {
ui._x = uix;
ui._y += slotw * 0.9;
ui.text(Project.fonts[i].name, Center);
if (ui.isHovered) ui.tooltip(Project.fonts[i].name);
ui._y -= slotw * 0.9;
if (i == Project.fonts.length - 1) {
ui._y += j == num - 1 ? imgw : imgw + ui.ELEMENT_H() + ui.ELEMENT_OFFSET();
}
}
}
ui._y += 6;
Sources/arm/ui/TabMaterials.hx
+4
View File
@@ -63,6 +63,7 @@ class TabMaterials {
var i = j + row * num;
if (i >= materials.length) {
@:privateAccess ui.endElement(imgw);
if (Config.raw.show_asset_names) @:privateAccess ui.endElement(0);
continue;
}
var img = ui.SCALE() > 1 ? materials[i].image : materials[i].imageIcon;
@@ -191,6 +192,9 @@ class TabMaterials {
ui.text(materials[i].canvas.name, Center);
if (ui.isHovered) ui.tooltip(materials[i].canvas.name);
ui._y -= slotw * 0.9;
if (i == materials.length - 1) {
ui._y += j == num - 1 ? imgw : imgw + ui.ELEMENT_H() + ui.ELEMENT_OFFSET();
}
}
}
Sources/arm/ui/TabTextures.hx
+23 -11
View File
@@ -37,16 +37,19 @@ class TabTextures {
var num = Std.int(Config.raw.layout[LayoutSidebarW] / slotw);
for (row in 0...Std.int(Math.ceil(Project.assets.length / num))) {
ui.row([for (i in 0...num) 1 / num]);
var mult = Config.raw.show_asset_names ? 2 : 1;
ui.row([for (i in 0...num * mult) 1 / num]);
ui._x += 2;
if (row > 0) ui._y += 6;
var off = Config.raw.show_asset_names ? ui.ELEMENT_OFFSET() * 10.0 : 6;
if (row > 0) ui._y += off;
for (j in 0...num) {
var imgw = Std.int(50 * ui.SCALE());
var i = j + row * num;
if (i >= Project.assets.length) {
@:privateAccess ui.endElement(imgw);
if (Config.raw.show_asset_names) @:privateAccess ui.endElement(0);
continue;
}
@@ -67,23 +70,21 @@ class TabTextures {
UIView2D.inst.hwnd.redraws = 2;
}
var _uix = ui._x;
var _uiy = ui._y;
ui._x = uix;
ui._y = uiy;
if (asset == Context.texture) {
var _uix = ui._x;
var _uiy = ui._y;
ui._x = uix;
ui._y = uiy;
var off = i % 2 == 1 ? 1 : 0;
var w = 50;
ui.fill(0, 0, w + 3, 2, ui.t.HIGHLIGHT_COL);
ui.fill(0, w - off + 2, w + 3, 2 + off, ui.t.HIGHLIGHT_COL);
ui.fill(0, 0, 2, w + 3, ui.t.HIGHLIGHT_COL);
ui.fill(w + 2, 0, 2, w + 4, ui.t.HIGHLIGHT_COL);
ui._x = _uix;
ui._y = _uiy;
}
ui._x = _uix;
ui._y = _uiy;
// End of row align
if (i % num == num - 1) ui._y = uiy + slotw;
if (ui.isHovered) ui.tooltipImage(img, 256);
@@ -157,6 +158,17 @@ class TabTextures {
}
}, 6);
}
if (Config.raw.show_asset_names) {
ui._x = uix;
ui._y += slotw * 0.9;
ui.text(Project.assets[i].name, Center);
if (ui.isHovered) ui.tooltip(Project.assets[i].name);
ui._y -= slotw * 0.9;
if (i == Project.assets.length - 1) {
ui._y += j == num - 1 ? imgw : imgw + ui.ELEMENT_H() + ui.ELEMENT_OFFSET();
}
}
}
}
}