mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Fix scroll bar overlapping text (again) (#9058)
This commit is contained in:
parent
9dc29a75b4
commit
0750047919
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user