From 49b399f80b9064b1f7b405e464ebc3ac83b51c77 Mon Sep 17 00:00:00 2001
From: JailDoctor <jaildoctor@gmail.com>
Date: Thu, 5 Oct 2023 20:02:59 +0200
Subject: [PATCH] =?UTF-8?q?-=20[NEW]=20ComboBox=20-=20El=20text=20en=20el?=
 =?UTF-8?q?=20Textbox=20ja=20no=20est=C3=A0=20centrat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/jui.cpp | 36 +++++++++++++++++++++++++++++++++---
 source/jui.h   |  1 +
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/source/jui.cpp b/source/jui.cpp
index d1cca75..2445f70 100644
--- a/source/jui.cpp
+++ b/source/jui.cpp
@@ -26,17 +26,47 @@ namespace ui
         return 0;
     }
 
+    const int combo(const char *label, const int x, const int y, const int w, const int h)
+    {
+        const int mx = input::mouseX();
+        const int my = input::mouseY();
+        const bool btnDown = input::mouseBtn(1) || input::mouseBtn(3);
+        const bool inside = (mx>=x) && (mx<x+w) && (my>=y) && (my<y+h);
+
+        draw::color(WHITE);
+        draw::fillrect(x, y, w, h);
+
+        draw::color(inside&&btnDown?BLACK:LIGHT+WHITE);
+        draw::hline(x,y,w);
+        draw::vline(x,y,h);
+        draw::vline(x+w-9,y,h);
+
+        draw::color(inside&&btnDown?LIGHT+WHITE:BLACK);
+        draw::hline(x,y+h-1,w);
+        draw::vline(x+w-1,y,h);
+
+        draw::print(label, x+3, y+3, inside?RED:PAPER, 0);
+        draw::print("v", x+w-6, y+3, PAPER, 0);
+
+        if (inside)
+        {
+            if (input::mouseClk(1)) return 1;
+            if (input::mouseClk(3)) return 3;
+        }
+        return 0;
+    }
+
     const int textbox(const char *label, const int x, const int y, const int w, const int h, const int c1, const int c2)
     {
         const int mx = input::mouseX();
         const int my = input::mouseY();
         const bool inside = (mx>=x) && (mx<x+w) && (my>=y) && (my<y+h);
-        const int txt_size = strlen(label)*4;
-        const int txt_x = x+(w-txt_size)/2;
 
         draw::color(inside?c2:c1);
         draw::fillrect(x, y, w, h);
-        draw::print(label, 1+txt_x, y+3, LIGHT+WHITE, PAPER);
+        draw::color(PAPER);
+        draw::rect(x, y, w, h);
+        draw::print(label, x+3, y+3, BLACK, 0);
 
         if (inside)
         {
diff --git a/source/jui.h b/source/jui.h
index 9cdcaa2..4e467d2 100644
--- a/source/jui.h
+++ b/source/jui.h
@@ -3,5 +3,6 @@
 namespace ui
 {
     const int button(const char *label, const int x, const int y, const int w, const int h, const int c1, const int c2, const int c3);
+    const int combo(const char *label, const int x, const int y, const int w, const int h);
     const int textbox(const char *label, const int x, const int y, const int w, const int h, const int c1, const int c2);
 }