PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: console/chat open still available when menu is open & cleanup

Browse Source
This commit is contained in:
MihailRis 2025-02-16 00:38:33 +03:00
parent 31d5cb6880
commit c7061c70cb
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/scripts/stdlib.lua
View File

@ -330,7 +330,7 @@ function __vc_on_hud_open()
hud._set_debug_cheats(value) hud._set_debug_cheats(value)
end) end)
input.add_callback("devtools.console", function() input.add_callback("devtools.console", function()
if hud.is_paused() then if menu.page ~= "" then
return return
end end
time.post_runnable(function() time.post_runnable(function()
@ -338,7 +338,7 @@ function __vc_on_hud_open()
end) end)
end) end)
input.add_callback("hud.chat", function() input.add_callback("hud.chat", function()
if hud.is_paused() then if menu.page ~= "" then
return return
end end
time.post_runnable(function() time.post_runnable(function()

8
src/graphics/ui/elements/TextBox.cpp
View File

@ -408,7 +408,9 @@ void TextBox::refresh() {
Container::refresh(); Container::refresh();
label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y)); label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
label->setPos(glm::vec2( label->setPos(glm::vec2(
padding.x + LINE_NUMBERS_PANE_WIDTH * showLineNumbers + textInitX - static_cast<int>(textOffset), padding.y padding.x + LINE_NUMBERS_PANE_WIDTH * showLineNumbers + textInitX -
static_cast<int>(textOffset),
padding.y
)); ));
} }
@ -815,8 +817,8 @@ size_t TextBox::getCaret() const {
return caret; return caret;
} }
void TextBox::setCaret(size_t position, bool ignoreFormatting) { void TextBox::setCaret(size_t position) {
const auto& labelText = ignoreFormatting ? label->getText() : input; const auto& labelText = label->getText();
caret = std::min(static_cast<size_t>(position), input.length()); caret = std::min(static_cast<size_t>(position), input.length());
if (font == nullptr) { if (font == nullptr) {
return; return;

2
src/graphics/ui/elements/TextBox.hpp
View File

@ -152,7 +152,7 @@ namespace gui {
/// @brief Set caret position in the text /// @brief Set caret position in the text
/// @param position integer in range [0, text.length()] /// @param position integer in range [0, text.length()]
virtual void setCaret(size_t position, bool ignoreFormatting = true); virtual void setCaret(size_t position);
/// @brief Set caret position in the text /// @brief Set caret position in the text
/// @param position integer in range [-text.length(), text.length()] /// @param position integer in range [-text.length(), text.length()]