From 3a992ce76d2c9261bcf35d9123d8c77a4c227eeb Mon Sep 17 00:00:00 2001 From: random-geek <35757396+random-geek@users.noreply.github.com> Date: Tue, 6 Nov 2018 14:28:34 -0800 Subject: [PATCH] Formspecs: Fix text clipped by scrollbars (#7816) --- src/gui/guiEditBoxWithScrollbar.cpp | 2 ++ src/gui/intlGUIEditBox.cpp | 2 ++ 2 files changed, 4 insertions(+) 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 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 scrollbarrect = FrameRect; scrollbarrect.UpperLeftCorner.X += FrameRect.getWidth() - m_scrollbar_width; m_vscrollbar = Environment->addScrollBar(false, scrollbarrect, getParent(), getID());