Fix GUIEditBoxWithScrollBar using a smaller steps than intlGUIEditBox (#11519)

diff --git a/src/gui/guiEditBoxWithScrollbar.cpp b/src/gui/guiEditBoxWithScrollbar.cpp
index c720707874602384bbf52bf2ef8d4318e4003880..fb4bc2a0b2b14e9c10089c666395b2de18d67d2b 100644 (file)
--- a/src/gui/guiEditBoxWithScrollbar.cpp
+++ b/src/gui/guiEditBoxWithScrollbar.cpp
@@ -620,6 +620,17 @@ void GUIEditBoxWithScrollBar::createVScrollBar()
        if (Environment)
                skin = Environment->getSkin();
 
+       s32 fontHeight = 1;
+
+       if (m_override_font) {
+               fontHeight = m_override_font->getDimension(L"Ay").Height;
+       } else {
+               IGUIFont *font;
+               if (skin && (font = skin->getFont())) {
+                       fontHeight = font->getDimension(L"Ay").Height;
+               }
+       }
+
        m_scrollbar_width = skin ? skin->getSize(gui::EGDS_SCROLLBAR_SIZE) : 16;
 
        irr::core::rect<s32> scrollbarrect = m_frame_rect;
@@ -628,8 +639,8 @@ void GUIEditBoxWithScrollBar::createVScrollBar()
                        scrollbarrect, false, true);
 
        m_vscrollbar->setVisible(false);
-       m_vscrollbar->setSmallStep(1);
-       m_vscrollbar->setLargeStep(1);
+       m_vscrollbar->setSmallStep(3 * fontHeight);
+       m_vscrollbar->setLargeStep(10 * fontHeight);
 }
 
 

diff --git a/util/ci/clang-format-whitelist.txt b/util/ci/clang-format-whitelist.txt
index 75d99f4cde2504a508a2c1fa8a706ea0990d84bb..5cbc262ef9a52b7e818cd6d07ba2b85f867931e0 100644 (file)
--- a/util/ci/clang-format-whitelist.txt
+++ b/util/ci/clang-format-whitelist.txt
@@ -192,8 +192,6 @@ src/gui/guiTable.cpp
 src/gui/guiTable.h
 src/gui/guiVolumeChange.cpp
 src/gui/guiVolumeChange.h
-src/gui/intlGUIEditBox.cpp
-src/gui/intlGUIEditBox.h
 src/gui/mainmenumanager.h
 src/gui/modalMenu.h
 src/guiscalingfilter.cpp