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

Use columns for viewing combo items

Browse Source
This commit is contained in:
Lubos Lenco
2021-05-03 19:27:36 +02:00
parent ba219faa9b
commit 545c27b0b7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/ui/TabLayers.hx
+2 -2
View File
@@ -50,7 +50,7 @@ class TabLayers {
if (atlases != null) for (a in atlases) ar.push(a); if (atlases != null) for (a in atlases) ar.push(a);
var filterHandle = Id.handle(); var filterHandle = Id.handle();
filterHandle.position = Context.layerFilter; filterHandle.position = Context.layerFilter;
Context.layerFilter = ui.combo(filterHandle, ar, tr("Filter"), false, Left, 16); Context.layerFilter = ui.combo(filterHandle, ar, tr("Filter"), false, Left);
if (filterHandle.changed) { if (filterHandle.changed) {
for (p in Project.paintObjects) { for (p in Project.paintObjects) {
p.visible = Context.layerFilter == 0 || p.name == ar[Context.layerFilter] || Project.isAtlasObject(p); p.visible = Context.layerFilter == 0 || p.name == ar[Context.layerFilter] || Project.isAtlasObject(p);
@@ -630,7 +630,7 @@ class TabLayers {
if (atlases != null) for (a in atlases) ar.push(a); if (atlases != null) for (a in atlases) ar.push(a);
var objectHandle = Id.handle().nest(l.id); var objectHandle = Id.handle().nest(l.id);
objectHandle.position = l.objectMask; objectHandle.position = l.objectMask;
l.objectMask = ui.combo(objectHandle, ar, tr("Object"), false, Left, 16); l.objectMask = ui.combo(objectHandle, ar, tr("Object"), false, Left);
if (objectHandle.changed) { if (objectHandle.changed) {
Context.setLayer(l); Context.setLayer(l);
MakeMaterial.parseMeshMaterial(); MakeMaterial.parseMeshMaterial();
Sources/arm/ui/UINodes.hx
+4
View File
@@ -516,6 +516,9 @@ class UINodes {
// Nodes // Nodes
ui.inputEnabled = !drawMenu; ui.inputEnabled = !drawMenu;
ui.windowBorderRight = Config.raw.layout[LayoutSidebarW];
ui.windowBorderTop = UIHeader.inst.headerh * 2;
ui.windowBorderBottom = Config.raw.layout[LayoutStatusH];
nodes.nodeCanvas(ui, c); nodes.nodeCanvas(ui, c);
ui.inputEnabled = true; ui.inputEnabled = true;
@@ -718,6 +721,7 @@ class UINodes {
nodes.nodesSelected = [node]; nodes.nodesSelected = [node];
nodes.nodesDrag = true; nodes.nodesDrag = true;
} }
// Next column
if (ui._y - wy + ui.ELEMENT_H() / 2 > wh) { ui._x += menuw; ui._y = py; } if (ui._y - wy + ui.ELEMENT_H() / 2 > wh) { ui._x += menuw; ui._y = py; }
} }
if (isGroupCategory) { if (isGroupCategory) {