[GuiAdvancedScrollText] Base scrollbar click change on text size (#2021)

Co-authored-by: oznogon <[email protected]>
daid · Oct 18, 2023 · 9934dda · 9934dda
1 parent 6eb8449
commit 9934dda
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/gui/gui2_advancedscrolltext.cpp b/src/gui/gui2_advancedscrolltext.cpp
@@ -5,6 +5,8 @@ GuiAdvancedScrollText::GuiAdvancedScrollText(GuiContainer* owner, string id)
 {
     scrollbar = new GuiScrollbar(this, id + "_SCROLL", 0, 1, 0, nullptr);
     scrollbar->setPosition(0, 0, sp::Alignment::TopRight)->setSize(50, GuiElement::GuiSizeMax);
+    // Calculate scrolling a one-line entry by scrollbar arrow buttons.
+    scrollbar->setClickChange(sp::RenderTarget::getDefaultFont()->prepare("1", 32, text_size, rect.size, sp::Alignment::TopLeft).getUsedAreaSize().y);
 }
 
 GuiAdvancedScrollText* GuiAdvancedScrollText::addEntry(string prefix, string text, glm::u8vec4 color, unsigned int seq)
@@ -23,6 +25,13 @@ unsigned int GuiAdvancedScrollText::getEntryCount() const
     return entries.size();
 }
 
+GuiAdvancedScrollText* GuiAdvancedScrollText::setTextSize(float text_size)
+{
+    this->text_size = std::max(1.0F, text_size);
+    scrollbar->setClickChange(sp::RenderTarget::getDefaultFont()->prepare("1", 32, text_size, rect.size, sp::Alignment::TopLeft).getUsedAreaSize().y);
+    return this;
+}
+
 string GuiAdvancedScrollText::getEntryText(int index) const
 {
     if (index < 0 || index >= static_cast<int>(getEntryCount()))
@@ -126,5 +135,6 @@ void GuiAdvancedScrollText::onDraw(sp::RenderTarget& renderer)
         if (auto_scroll_down)
             scrollbar->setValue(scrollbar->getValue() + diff);
     }
+
     scrollbar->setVisible(rect.size.y > 100);
 }
diff --git a/src/gui/gui2_advancedscrolltext.h b/src/gui/gui2_advancedscrolltext.h
@@ -34,7 +34,7 @@ class GuiAdvancedScrollText : public GuiElement
     GuiAdvancedScrollText* disableAutoScrollDown() { auto_scroll_down = false; return this; }
 
     GuiAdvancedScrollText* addEntry(string prefix, string text, glm::u8vec4 color, unsigned int seq);
-    GuiAdvancedScrollText* setTextSize(float text_size) { this->text_size = text_size; return this; }
+    GuiAdvancedScrollText* setTextSize(float text_size);
 
     unsigned int getEntryCount() const;
     string getEntryText(int index) const;