oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Fix warnings introduced by 9b8fa99fe3

Browse source
This commit is contained in:
Loic Blot 2017-10-10 19:30:18 +02:00
parent 32ae492657
commit 1ff5c20442
No known key found for this signature in database
GPG key ID: EFAA458E8C153987
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/guiEditBoxWithScrollbar.cpp
View file

@ -131,7 +131,7 @@ video::SColor GUIEditBoxWithScrollBar::getOverrideColor() const
//! Turns the border on or off //! Turns the border on or off
void GUIEditBoxWithScrollBar::setDrawBorder(bool border) void GUIEditBoxWithScrollBar::setDrawBorder(bool border)
{ {
border = border; m_border = border;
} }
//! Sets whether to draw the background //! Sets whether to draw the background
@ -1433,7 +1433,7 @@ void GUIEditBoxWithScrollBar::updateVScrollBar()
} }
// check if a vertical scrollbar is needed ? // check if a vertical scrollbar is needed ?
if (getTextDimension().Height > m_frame_rect.getHeight()) { if (getTextDimension().Height > (u32) m_frame_rect.getHeight()) {
m_frame_rect.LowerRightCorner.X -= m_scrollbar_width; m_frame_rect.LowerRightCorner.X -= m_scrollbar_width;
s32 scrollymax = getTextDimension().Height - m_frame_rect.getHeight(); s32 scrollymax = getTextDimension().Height - m_frame_rect.getHeight();

2
src/intlGUIEditBox.cpp
View file

@ -1517,7 +1517,7 @@ void intlGUIEditBox::updateVScrollBar()
} }
// check if a vertical scrollbar is needed ? // check if a vertical scrollbar is needed ?
if (getTextDimension().Height > FrameRect.getHeight()) { if (getTextDimension().Height > (u32) FrameRect.getHeight()) {
s32 scrollymax = getTextDimension().Height - FrameRect.getHeight(); s32 scrollymax = getTextDimension().Height - FrameRect.getHeight();
if (scrollymax != m_vscrollbar->getMax()) { if (scrollymax != m_vscrollbar->getMax()) {
m_vscrollbar->setMax(scrollymax); m_vscrollbar->setMax(scrollymax);