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

ui cleanup

Browse Source
This commit is contained in:
luboslenco
2025-08-15 22:59:45 +02:00
parent 47f1147ba5
commit e9bc7dfecb
40 changed files with 343 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/nodes/brush_output_node_ext.ts
+1 -1
View File
@@ -122,7 +122,7 @@ function brush_output_node_run(self: brush_output_node_t, from: i32) {
return;
}
if (ui_base_ui.is_hovered ||
if (ui.is_hovered ||
base_is_dragging ||
base_is_resizing ||
base_is_scrolling() ||
paint/sources/ui_header_ext.ts
+2 -2
View File
@@ -1,7 +1,7 @@
let _ui_header_draw_tool_properties_h: ui_handle_t;
function ui_header_draw_tool_properties(ui: ui_t) {
function ui_header_draw_tool_properties() {
if (context_raw.tool == tool_type_t.COLORID) {
ui_text(tr("Picked Color"));
if (context_raw.colorid_picked) {
@@ -103,7 +103,7 @@ function ui_header_draw_tool_properties(ui: ui_t) {
}
if (ui.is_hovered && ui.input_released) {
_ui_header_draw_tool_properties_h = h;
ui_menu_draw(function (ui: ui_t) {
ui_menu_draw(function () {
ui_fill(0, 0, ui._w / UI_SCALE(), ui.ops.theme.ELEMENT_H * 9, ui.ops.theme.SEPARATOR_COL);
ui.changed = false;
ui_color_wheel(_ui_header_draw_tool_properties_h, false, -1, 10 * ui.ops.theme.ELEMENT_H * UI_SCALE(), false);
paint/sources/ui_toolbar_ext.ts
+15 -15
View File
@@ -1,17 +1,17 @@
function ui_toolbar_ext_draw_tools(ui: ui_t, img: gpu_texture_t, icon_accent: i32, keys: string[]) {
ui_toolbar_draw_tool(tool_type_t.BRUSH, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.ERASER, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.FILL, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.DECAL, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.TEXT, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.CLONE, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.BLUR, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.SMUDGE, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.PARTICLE, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.COLORID, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.PICKER, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.BAKE, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.MATERIAL, ui, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.GIZMO, ui, img, icon_accent, keys);
function ui_toolbar_ext_draw_tools(img: gpu_texture_t, icon_accent: i32, keys: string[]) {
ui_toolbar_draw_tool(tool_type_t.BRUSH, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.ERASER, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.FILL, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.DECAL, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.TEXT, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.CLONE, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.BLUR, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.SMUDGE, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.PARTICLE, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.COLORID, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.PICKER, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.BAKE, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.MATERIAL, img, icon_accent, keys);
ui_toolbar_draw_tool(tool_type_t.GIZMO, img, icon_accent, keys);
}