From 1f0b6f0d9d665f6222c1959f6550847a7da05517 Mon Sep 17 00:00:00 2001
From: Xertis <118364459+Xertis@users.noreply.github.com>
Date: Mon, 4 Aug 2025 20:50:27 +0300
Subject: [PATCH] Qol settings.controls update

---
 res/layouts/templates/binding.xml |   5 +++--
 res/preload.json                  |   3 ++-
 res/texts/en_US.txt               |   1 +
 res/texts/ru_RU.txt               |   1 +
 res/textures/gui/half_block.png   | Bin 0 -> 531 bytes
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 res/textures/gui/half_block.png

diff --git a/res/layouts/templates/binding.xml b/res/layouts/templates/binding.xml
index 643bd5aa..92843749 100644
--- a/res/layouts/templates/binding.xml
+++ b/res/layouts/templates/binding.xml
@@ -1,4 +1,5 @@
-<panel size='400,40' padding='4' color='0' orientation='horizontal'>
+<panel id='bind_%{id}' size='400,40' padding='4' color='0' orientation='horizontal'>
     <bindbox binding='%{id}'/>
-    <label margin='6'>%{name}</label>
+    <image id="bindmark_%{id}"src='gui/left_half_block' size='4,28' visible="false"/>
+    <label id='bindlabel_%{id}' color="#ffffffff" margin='6'>%{name}</label>
 </panel>
diff --git a/res/preload.json b/res/preload.json
index 887b0e26..0cd11b5b 100644
--- a/res/preload.json
+++ b/res/preload.json
@@ -47,7 +47,8 @@
         "gui/info",
         "gui/world",
         "gui/hud",
-        "gui/entity"
+        "gui/entity",
+        "gui/half_block"
     ],
     "fonts": [
         {
diff --git a/res/texts/en_US.txt b/res/texts/en_US.txt
index 57a6cb6b..b3be4c92 100644
--- a/res/texts/en_US.txt
+++ b/res/texts/en_US.txt
@@ -22,6 +22,7 @@ graphics.dense-render.tooltip=Enables transparency in blocks like leaves
 
 # settings
 settings.Controls Search Mode=Search by attached button name
+settings.Conflict=Possible conflicts found
 
 # Bindings
 chunks.reload=Reload Chunks
diff --git a/res/texts/ru_RU.txt b/res/texts/ru_RU.txt
index d2d7c63e..5d8d22ca 100644
--- a/res/texts/ru_RU.txt
+++ b/res/texts/ru_RU.txt
@@ -100,6 +100,7 @@ settings.Controls Search Mode=Поиск по привязанной кнопк
 settings.Limit Background FPS=Ограничить фоновую частоту кадров
 settings.Advanced render=Продвинутый рендер
 settings.Shadows quality=Качество теней
+settings.Conflict=Найдены возможные конфликты
 
 # Управление
 chunks.reload=Перезагрузить Чанки
diff --git a/res/textures/gui/half_block.png b/res/textures/gui/half_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d6b699ed06e5d85ec26040170976688d5a5f1db
GIT binary patch
literal 531
zcmeAS@N?(olHy`uVBq!ia0vp^EI`b`!3HGn8ON~#DaPU;cPEB*=VV@jWYZme9T^xl
z_H+M91W9rhctjR6Fz_7&Va6R3v)=+Wv}cAyltlRYSS9D@>LsS+C#C9D<Q4!`GcefL
zR}>^BXQ!4ZB&DWj=Gm&h-@RX5Av48RJ>1mSz_-9TH6zobswg$M$}c3jDm&RSMcv+x
zm&>NY3TQ%ZYDuC(MQ%=Bu~mhw64+oXAR8pCuViOal#*r@<l+WZ0p!^#Wt5Z@Sn2DR
zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)Qsxa7isrF3Kz@$;{7F02!E=
zlwVq6t5jN=nPQcem}Z)kl47cxlxUoyYiO8~sGFE#Y^a-JY@A|lYG`4UW|*V|wZ0@X
z4Pk#?F*F!}0iq9*(KpmH067`Nw(>8^Oa;0EWTl;<4OkvU%tjyN5G04$K}3Ll1+w5F
z0}3X1=%(fYgR~qNb~;mLa0A0#)YHW=L?S%-&;S4b>)BKew47NupMgQ*0t?THlb7{C
OG2`j#=d#Wzp$P!L;;2mk

literal 0
HcmV?d00001