From 13fde2116d095b9393c4f5804ba23071e5f56ad6 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Tue, 21 Jan 2025 04:42:08 +0300
Subject: [PATCH] fix textbox horizontal scroll & fix console log width

---
 res/layouts/console.xml              | 4 ++--
 src/graphics/ui/elements/TextBox.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/layouts/console.xml b/res/layouts/console.xml
index 43e72dd8..18d72163 100644
--- a/res/layouts/console.xml
+++ b/res/layouts/console.xml
@@ -12,7 +12,7 @@
     </container>
     
     <container id="logContainer" pos="0,60"
-               size-func="unpack(vec2.add(gui.get_viewport(), {0,-100}))">
+               size-func="unpack(vec2.add(gui.get_viewport(), {-350,-100}))">
         <textbox 
             id='log' 
             color='0'
@@ -20,7 +20,7 @@
             margin='0'
             editable='false' 
             multiline='true' 
-            size-func="gui.get_viewport()[1],40"
+            size-func="gui.get_viewport()[1]-350,40"
             gravity="bottom-left"
             markup="md"
         ></textbox>
diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp
index f1ed6608..12f262f1 100644
--- a/src/graphics/ui/elements/TextBox.cpp
+++ b/src/graphics/ui/elements/TextBox.cpp
@@ -826,7 +826,7 @@ void TextBox::setCaret(size_t position) {
         scrolled(-glm::ceil(offset/static_cast<double>(scrollStep)+0.5f));
     }
     uint lcaret = caret - label->getTextLineOffset(line);
-    int realoffset = font->calcWidth(input, lcaret)-int(textOffset)+2;
+    int realoffset = font->calcWidth(input, lcaret)-int(textOffset) - padding.x;
     if (realoffset-width > 0) {
         setTextOffset(textOffset + realoffset-width);
     } else if (realoffset < 0) {