Fix scroll bar overlapping text (again) (#9058)

minetest · Oct 3, 2020 · 07500479191ed927ab661b3758ffcd2fd43158c5 · 0750047
1 parent 9dc29a7
commit 07500479191ed927ab661b3758ffcd2fd43158c5
Unified Split

Showing with 2 additions and 6 deletions.

+1 −3 src/gui/guiEditBoxWithScrollbar.cpp

+1 −3 src/gui/intlGUIEditBox.cpp
diff --git a/src/gui/guiEditBoxWithScrollbar.cpp b/src/gui/guiEditBoxWithScrollbar.cpp
@@ -1028,7 +1028,7 @@ void GUIEditBoxWithScrollBar::breakText()
 	s32 last_line_start = 0;
 	s32 size = Text.size();
 	s32 length = 0;
-	s32 el_width = RelativeRect.getWidth() - 6;
+	s32 el_width = RelativeRect.getWidth() - m_scrollbar_width - 10;
 	wchar_t c;
 
 	for (s32 i = 0; i < size; ++i) {
@@ -1399,8 +1399,6 @@ 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 = new GUIScrollBar(Environment, getParent(), -1,

diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp
@@ -1165,7 +1165,7 @@ void intlGUIEditBox::breakText()
 	s32 lastLineStart = 0;
 	s32 size = Text.size();
 	s32 length = 0;
-	s32 elWidth = RelativeRect.getWidth() - 6;
+	s32 elWidth = RelativeRect.getWidth() - m_scrollbar_width - 10;
 	wchar_t c;
 
 	for (s32 i=0; i<size; ++i)
@@ -1478,8 +1478,6 @@ 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 = new GUIScrollBar(Environment, getParent(), -1,