BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix warnings introduced by 9b8fa99fe30728c1fcfa73cdf74211841bdae9fb

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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
@ -257,7 +257,7 @@ bool GUIEditBoxWithScrollBar::processKey(const SEvent& event)
if (!m_writable) { if (!m_writable) {
return false; return false;
} }
if (!event.KeyInput.PressedDown) if (!event.KeyInput.PressedDown)
return false; return false;
@ -791,7 +791,7 @@ void GUIEditBoxWithScrollBar::draw()
} else { } else {
mend = font->getDimension(txt_line->c_str()).Width; mend = font->getDimension(txt_line->c_str()).Width;
} }
m_current_text_rect.UpperLeftCorner.X += mbegin; m_current_text_rect.UpperLeftCorner.X += mbegin;
m_current_text_rect.LowerRightCorner.X = m_current_text_rect.UpperLeftCorner.X + mend - mbegin; m_current_text_rect.LowerRightCorner.X = m_current_text_rect.UpperLeftCorner.X + mend - mbegin;
@ -1041,7 +1041,7 @@ void GUIEditBoxWithScrollBar::breakText()
bool line_break = false; bool line_break = false;
if (c == L'\r') { // Mac or Windows breaks if (c == L'\r') { // Mac or Windows breaks
line_break = true; line_break = true;
c = 0; c = 0;
if (Text[i + 1] == L'\n') { // Windows breaks if (Text[i + 1] == L'\n') { // Windows breaks
@ -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);