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

fix textbox horizontal scroll & fix console log width

Browse Source
This commit is contained in:
MihailRis 2025-01-21 04:42:08 +03:00
parent 85600eafea
commit 13fde2116d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layouts/console.xml
View File

@ -12,7 +12,7 @@
</container> </container>
<container id="logContainer" pos="0,60" <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 <textbox
id='log' id='log'
color='0' color='0'
@ -20,7 +20,7 @@
margin='0' margin='0'
editable='false' editable='false'
multiline='true' multiline='true'
size-func="gui.get_viewport()[1],40" size-func="gui.get_viewport()[1]-350,40"
gravity="bottom-left" gravity="bottom-left"
markup="md" markup="md"
></textbox> ></textbox>

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

@ -826,7 +826,7 @@ void TextBox::setCaret(size_t position) {
scrolled(-glm::ceil(offset/static_cast<double>(scrollStep)+0.5f)); scrolled(-glm::ceil(offset/static_cast<double>(scrollStep)+0.5f));
} }
uint lcaret = caret - label->getTextLineOffset(line); 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) { if (realoffset-width > 0) {
setTextOffset(textOffset + realoffset-width); setTextOffset(textOffset + realoffset-width);
} else if (realoffset < 0) { } else if (realoffset < 0) {