From 3370fc334135bfb5e4bdbdccfdc866cbbe4258d7 Mon Sep 17 00:00:00 2001 From: Sergwest585 Date: Tue, 22 Oct 2024 02:02:37 +0300 Subject: [PATCH 1/3] very important -p flag in mkdir in run.sh --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 332323b0..0bf5a60a 100755 --- a/run.sh +++ b/run.sh @@ -1,4 +1,4 @@ -mkdir build +mkdir -p build cd build cmake -DCMAKE_BUILD_TYPE=Release .. cmake --build . -j$(nproc) From c725775939fe7d71b7dc2f0c07cd1e741b791338 Mon Sep 17 00:00:00 2001 From: Sergwest585 Date: Tue, 22 Oct 2024 02:04:35 +0300 Subject: [PATCH 2/3] remove excess script --- res/layouts/pages/settings_controls.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/layouts/pages/settings_controls.xml b/res/layouts/pages/settings_controls.xml index c52abbbb..678b129f 100644 --- a/res/layouts/pages/settings_controls.xml +++ b/res/layouts/pages/settings_controls.xml @@ -5,7 +5,7 @@ consumer='change_sensitivity'> - + From daae8a370703d79bc4f5101451a121974d89a676 Mon Sep 17 00:00:00 2001 From: Sergwest585 Date: Tue, 22 Oct 2024 03:22:54 +0300 Subject: [PATCH 3/3] fix fullcheckbox resize function --- res/layouts/pages/settings_controls.xml.lua | 2 +- src/graphics/ui/elements/CheckBox.cpp | 6 +++--- src/graphics/ui/elements/CheckBox.hpp | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/res/layouts/pages/settings_controls.xml.lua b/res/layouts/pages/settings_controls.xml.lua index e975d9c4..d1aba71e 100644 --- a/res/layouts/pages/settings_controls.xml.lua +++ b/res/layouts/pages/settings_controls.xml.lua @@ -45,7 +45,7 @@ function on_open() refresh_sensitivity() document.search_panel:add(string.format( - "%s", + "%s", gui.str("controls.key.tooltip", "settings"), gui.str("Key", "settings") )) diff --git a/src/graphics/ui/elements/CheckBox.cpp b/src/graphics/ui/elements/CheckBox.cpp index 21b7153f..ac55508c 100644 --- a/src/graphics/ui/elements/CheckBox.cpp +++ b/src/graphics/ui/elements/CheckBox.cpp @@ -46,13 +46,13 @@ CheckBox* CheckBox::setChecked(bool flag) { FullCheckBox::FullCheckBox(const std::wstring& text, glm::vec2 size, bool checked) : Panel(size), - checkbox(std::make_shared(checked)){ + checkbox(std::make_shared(checked)), + label(std::make_shared