summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandom-geek <35757396+random-geek@users.noreply.github.com>2018-11-06 14:28:34 -0800
committerParamat <paramat@users.noreply.github.com>2018-11-06 22:28:34 +0000
commit3a992ce76d2c9261bcf35d9123d8c77a4c227eeb (patch)
tree6b34f6bb473888551accf29e56313afd2b45adb9
parent0e306c084284aeafb3d5cde0cfec11a85a11cb9c (diff)
downloadminetest-3a992ce76d2c9261bcf35d9123d8c77a4c227eeb.tar.gz
minetest-3a992ce76d2c9261bcf35d9123d8c77a4c227eeb.tar.bz2
minetest-3a992ce76d2c9261bcf35d9123d8c77a4c227eeb.zip
Formspecs: Fix text clipped by scrollbars (#7816)
-rw-r--r--src/gui/guiEditBoxWithScrollbar.cpp2
-rw-r--r--src/gui/intlGUIEditBox.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/guiEditBoxWithScrollbar.cpp b/src/gui/guiEditBoxWithScrollbar.cpp
index 4723437bd..f7f933527 100644
--- a/src/gui/guiEditBoxWithScrollbar.cpp
+++ b/src/gui/guiEditBoxWithScrollbar.cpp
@@ -1401,6 +1401,8 @@ void GUIEditBoxWithScrollBar::createVScrollBar()
m_scrollbar_width = skin ? skin->getSize(gui::EGDS_SCROLLBAR_SIZE) : 16;
+ RelativeRect.LowerRightCorner.X -= m_scrollbar_width + 4;
+
irr::core::rect<s32> scrollbarrect = m_frame_rect;
scrollbarrect.UpperLeftCorner.X += m_frame_rect.getWidth() - m_scrollbar_width;
m_vscrollbar = Environment->addScrollBar(false, scrollbarrect, getParent(), getID());
diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp
index 0b7adffc4..374fcc8bb 100644
--- a/src/gui/intlGUIEditBox.cpp
+++ b/src/gui/intlGUIEditBox.cpp
@@ -1482,6 +1482,8 @@ void intlGUIEditBox::createVScrollBar()
}
}
+ RelativeRect.LowerRightCorner.X -= m_scrollbar_width + 4;
+
irr::core::rect<s32> scrollbarrect = FrameRect;
scrollbarrect.UpperLeftCorner.X += FrameRect.getWidth() - m_scrollbar_width;
m_vscrollbar = Environment->addScrollBar(false, scrollbarrect, getParent(), getID());