From f1162c797dbea409e7f92510200c94657ea4bb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= <zaklaus@outlook.com>
Date: Sun, 16 May 2021 15:15:44 +0200
Subject: [PATCH] rework add op ui

---
 art/demo.ecotex                          | Bin 146 -> 146 bytes
 art/test.ecotex                          | Bin 69 -> 69 bytes
 code/game/source/editors/texed.c         |   2 +-
 code/game/source/editors/texed_widgets.c |  80 +++++++++--------------
 4 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/art/demo.ecotex b/art/demo.ecotex
index 5cb3d95401e564d28c9a143d29965b820f95fa10..bfad6e300c9eaefc69abad302e6332468298e1b5 100644
GIT binary patch
delta 15
WcmbQlIEj&onPnoA2jk(1-tGV#U<2|1

delta 15
WcmbQlIEj&onQ0=E2jiiM-tGV#N(1iz

diff --git a/art/test.ecotex b/art/test.ecotex
index 14753c6189df9a48c7ecffe35dd3058e665c108b..91e29eea7c9edd01685a974514a46234cbd998e1 100644
GIT binary patch
delta 13
UcmZ>DWoKqQ<scdwHj&*902IsvHUIzs

delta 13
UcmZ>DWoKqQ<<P*uFp=F302ECE_5c6?

diff --git a/code/game/source/editors/texed.c b/code/game/source/editors/texed.c
index c3915fb..21565dc 100644
--- a/code/game/source/editors/texed.c
+++ b/code/game/source/editors/texed.c
@@ -226,7 +226,7 @@ void texed_run(int argc, char **argv) {
         };
         zpl_aabb2 orig_screen = screen;
         
-        zpl_aabb2 topbar = zpl_aabb2_cut_top(&screen, 25.0f);
+        zpl_aabb2 topbar = zpl_aabb2_cut_top(&screen, 20.0f);
         zpl_aabb2 oplist_pane = zpl_aabb2_cut_right(&screen, screenWidth / 2.0f);
         zpl_aabb2 property_pane = zpl_aabb2_cut_bottom(&screen, screenHeight / 2.0f);
         zpl_aabb2 preview_window = screen;
diff --git a/code/game/source/editors/texed_widgets.c b/code/game/source/editors/texed_widgets.c
index e5db9ad..f1e048d 100644
--- a/code/game/source/editors/texed_widgets.c
+++ b/code/game/source/editors/texed_widgets.c
@@ -105,6 +105,26 @@ void texed_draw_topbar(zpl_aabb2 r) {
         }
     }
     
+    zpl_aabb2 split_r = zpl_aabb2_cut_left(&r, 5.0f);
+    split_r = zpl_aabb2_contract(&split_r, 2.0f);
+    DrawAABB(split_r, BLACK);
+    
+    zpl_aabb2 exports_r = zpl_aabb2_cut_left(&r, 240.0f);
+    GuiSetState(ctx.filepath ? GUI_STATE_NORMAL : GUI_STATE_DISABLED);
+    zpl_aabb2 export_code_r = zpl_aabb2_cut_left(&exports_r, 120.0f);
+    
+    if (GuiButton(aabb2_ray(export_code_r), "BUILD TEXTURE")) {
+        texed_export_cc(ctx.filepath);
+    }
+    
+    zpl_aabb2 export_img_r = zpl_aabb2_cut_left(&exports_r, 120.0f);
+    
+    if (GuiButton(aabb2_ray(export_img_r), "EXPORT AS IMAGE")) {
+        texed_export_png(ctx.filepath);
+    }
+    GuiSetState(GUI_STATE_NORMAL);
+    
+    
     zpl_aabb2 prj_name_r = zpl_aabb2_cut_right(&r, 200.0f);
     zpl_aabb2_cut_right(&prj_name_r, 15.0f);
     GuiSetStyle(LABEL, TEXT_ALIGNMENT, GUI_TEXT_ALIGN_RIGHT);
@@ -112,42 +132,23 @@ void texed_draw_topbar(zpl_aabb2 r) {
     GuiSetStyle(LABEL, TEXT_ALIGNMENT, GUI_TEXT_ALIGN_LEFT);
 }
 
-static bool is_add_op_dropbox_open = false;
-static int add_op_dropbox_selected = 0;
-static char add_op_list[2000] = {0};
-
 void texed_draw_oplist_pane(zpl_aabb2 r) {
-    zpl_aabb2 oplist_header = zpl_aabb2_cut_top(&r, 40.0f);
-    
-    zpl_aabb2 add_op_r = zpl_aabb2_cut_left(&oplist_header, 120.0f);
-    
-    if (!is_add_op_dropbox_open && GuiButton(aabb2_ray(add_op_r), "ADD OPERATION")) {
-        is_add_op_dropbox_open = true;
-        zpl_memset(add_op_list, 0, sizeof(add_op_list));
+    // NOTE(zaklaus): add operator
+    {
+        zpl_aabb2 add_op_r = zpl_aabb2_cut_right(&r, 120.0f);
+        DrawAABB(add_op_r, GetColor(0x122025));
+        add_op_r = zpl_aabb2_contract(&add_op_r, 3.0f);
         
-        for (int i = 0, cnt = 0; i < DEF_OPS_LEN; i += 1) {
-            if (ctx.ops[i].is_locked) continue;
-            zpl_strcat(add_op_list, zpl_bprintf("%s%s", cnt == 0 ? "" : ";", default_ops[i].name));
-            cnt += 1;
+        for (int i = 0; i < DEF_OPS_LEN; i += 1) {
+            if (default_ops[i].is_locked) continue;
+            
+            zpl_aabb2 add_op_btn_r = zpl_aabb2_cut_top(&add_op_r, 20.0f);
+            if (GuiButton(aabb2_ray(add_op_btn_r), default_ops[i].name)) {
+                texed_add_op(i);
+            }
         }
     }
     
-    GuiSetState(ctx.filepath ? GUI_STATE_NORMAL : GUI_STATE_DISABLED);
-    
-    zpl_aabb2 export_code_r = zpl_aabb2_cut_left(&oplist_header, 120.0f);
-    
-    if (GuiButton(aabb2_ray(export_code_r), "BUILD TEXTURE")) {
-        texed_export_cc(ctx.filepath);
-    }
-    
-    zpl_aabb2 export_img_r = zpl_aabb2_cut_left(&oplist_header, 120.0f);
-    
-    if (GuiButton(aabb2_ray(export_img_r), "EXPORT AS IMAGE")) {
-        texed_export_png(ctx.filepath);
-    }
-    
-    GuiSetState(GUI_STATE_NORMAL);
-    
     // NOTE(zaklaus): operator list
     for (int i = 0; i < zpl_array_count(ctx.ops); i += 1) {
         zpl_aabb2 op_item_r = zpl_aabb2_cut_top(&r, 25.0f);
@@ -223,23 +224,6 @@ void texed_draw_oplist_pane(zpl_aabb2 r) {
         
         GuiDrawText(zpl_bprintf("%s %s", ctx.ops[i].name, ctx.ops[i].is_locked ? "(locked)" : ""), GetTextBounds(LABEL, list_text), GuiGetStyle(LABEL, TEXT_ALIGNMENT), Fade(RAYWHITE, guiAlpha));
     }
-    
-    static int op_dropdown_state = 0;
-    
-    if (is_add_op_dropbox_open && (op_dropdown_state = GuiDropdownBoxEco(aabb2_ray(add_op_r), add_op_list, "ADD OPERATION", &add_op_dropbox_selected, true)) > 0) {
-        is_add_op_dropbox_open = false;
-        if (op_dropdown_state < 2) {
-            int idx = 0;
-            for (int i = 0; i < DEF_OPS_LEN; i += 1) {
-                if (!default_ops[i].is_locked && idx == add_op_dropbox_selected) {
-                    idx = i;
-                    break;
-                }
-                else if (!default_ops[i].is_locked) idx += 1;
-            }
-            texed_add_op(idx);
-        }
-    }
 }
 
 void texed_draw_props_pane(zpl_aabb2 r) {