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

textbox scroll fix

Browse Source
This commit is contained in:
@clasher113
2024-04-29 14:31:48 +03:00
parent beb2bff77a
commit 47214d8e52
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/gui/controls.cpp
+6 -6
View File
@@ -646,7 +646,7 @@ void gui::TextBox::scrolled(int value) {
glm::vec2 offset = label->getTextOffset(); glm::vec2 offset = label->getTextOffset();
float alignmentOffset = std::max(0.f, label->getVerticalAlignmentOffset()); float alignmentOffset = std::max(0.f, label->getVerticalAlignmentOffset());
offset.y = std::clamp(offset.y + value * lineHeight, offset.y = std::clamp(offset.y + value * lineHeight,
-std::max(lineHeight * label->getLinesNumber() - label->getSize().y - alignmentOffset, 0.f), // min (scroll down) -std::max(lineHeight * label->getLinesNumber() - (size.y - (padding.w + padding.y)) - alignmentOffset, 0.f), // min (scroll down)
alignmentOffset); // max (scroll up) alignmentOffset); // max (scroll up)
label->setTextOffset(offset); label->setTextOffset(offset);
} }
@@ -867,15 +867,15 @@ void TextBox::setCaret(uint position) {
this->caret = std::min(size_t(position), input.length()); this->caret = std::min(size_t(position), input.length());
caretLastMove = Window::time(); caretLastMove = Window::time();
int width = label->getSize().x; glm::vec2 lSize(size - glm::vec2(padding.z + padding.x, padding.w + padding.y));
uint line = label->getLineByTextIndex(caret); uint line = label->getLineByTextIndex(caret);
glm::vec2 textOffset = label->getTextOffset(); glm::vec2 textOffset = label->getTextOffset();
if (scrollable){ if (scrollable){
int offset = label->getLineYOffset(line); int offset = label->getLineYOffset(line);
uint lineHeight = font->getLineHeight()*label->getLineInterval(); uint lineHeight = font->getLineHeight()*label->getLineInterval();
if (offset >= label->getSize().y - lineHeight) { // scroll down if (offset >= lSize.y - lineHeight) { // scroll down
label->setTextOffset(glm::vec2(textOffset.x, std::min(0.f, textOffset.y - (offset - label->getSize().y) - lineHeight))); label->setTextOffset(glm::vec2(textOffset.x, std::min(0.f, textOffset.y - (offset - lSize.y) - lineHeight)));
} else if (offset < 0.f) { // scroll up } else if (offset < 0.f) { // scroll up
label->setTextOffset(glm::vec2(textOffset.x, std::min(std::max(0.f, label->getVerticalAlignmentOffset()), textOffset.y - offset + lineHeight))); label->setTextOffset(glm::vec2(textOffset.x, std::min(std::max(0.f, label->getVerticalAlignmentOffset()), textOffset.y - offset + lineHeight)));
} }
@@ -883,8 +883,8 @@ void TextBox::setCaret(uint position) {
} }
uint lcaret = caret - label->getTextLineOffset(line); uint lcaret = caret - label->getTextLineOffset(line);
int realoffset = font->calcWidth(input, lcaret)+textOffset.x+2; int realoffset = font->calcWidth(input, lcaret)+textOffset.x+2;
if (realoffset > width) { if (realoffset > lSize.x) {
label->setTextOffset(glm::vec2(textOffset.x - (realoffset - width), textOffset.y)); label->setTextOffset(glm::vec2(textOffset.x - (realoffset - lSize.x), textOffset.y));
} else if (realoffset < 0) { } else if (realoffset < 0) {
label->setTextOffset(glm::vec2(textOffset.x - realoffset, textOffset.y)); label->setTextOffset(glm::vec2(textOffset.x - realoffset, textOffset.y));
} }