paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix a valgrind warning about uninitilized variables in the scrollbar code and some comment/style fixes.

Browse Source 
This was SVN commit r14764.
This commit is contained in:
JoshuaJB 2014-02-19 21:59:07 +00:00
parent facf119241
commit e182b4ddd2
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/gui/CGUI.cpp
View File

@ -1631,7 +1631,7 @@ void CGUI::Xeromyces_ReadStyle(XMBElement Element, CXeromyces* pFile)
CStr name;
//
// Read Attributes
// Read Attributes
//
// Now we can iterate all attributes and store
@ -1650,7 +1650,7 @@ void CGUI::Xeromyces_ReadStyle(XMBElement Element, CXeromyces* pFile)
}
//
// Add to CGUI
// Add to CGUI
//
m_Styles[name] = style;
@ -1661,9 +1661,15 @@ void CGUI::Xeromyces_ReadScrollBarStyle(XMBElement Element, CXeromyces* pFile)
// style object we're adding
SGUIScrollBarStyle scrollbar;
CStr name;
// Setup some defaults.
scrollbar.m_MinimumBarSize = 0.f;
// Using 1.0e100 as a substitute for infinity
scrollbar.m_MaximumBarSize = 1.0e100;
scrollbar.m_UseEdgeButtons = false;
//
// Read Attributes
// Read Attributes
//
// Now we can iterate all attributes and store

2
source/gui/CTooltip.cpp
View File

@ -140,7 +140,7 @@ void CTooltip::SetupText()
size.pixel.right -= size.pixel.left, size.pixel.left = 0.f;
else if (size.pixel.right > screenw)
size.pixel.left -= (size.pixel.right-screenw), size.pixel.right = screenw;
GUI<CClientArea>::SetSetting(this, "size", size);
}

4
source/gui/IGUIObject.cpp
View File

@ -49,11 +49,13 @@ IGUIObject::IGUIObject() :
AddSetting(GUIST_bool, "hidden");
AddSetting(GUIST_CClientArea, "size");
AddSetting(GUIST_CStr, "style");
AddSetting(GUIST_CStr, "hotkey" );
AddSetting(GUIST_CStr, "hotkey");
AddSetting(GUIST_float, "z");
AddSetting(GUIST_bool, "absolute");
AddSetting(GUIST_bool, "ghost");
AddSetting(GUIST_float, "aspectratio");
AddSetting(GUIST_CStrW, "tooltip");
AddSetting(GUIST_CStr, "tooltip_style");
// Setup important defaults
GUI<bool>::SetSetting(this, "hidden", false);

4
source/gui/IGUIScrollBar.cpp
View File

@ -47,9 +47,7 @@ IGUIScrollBar::~IGUIScrollBar()
void IGUIScrollBar::SetupBarSize()
{
if (!GetStyle())
{
return;
}
float min = GetStyle()->m_MinimumBarSize;
float max = GetStyle()->m_MaximumBarSize;
float length = m_Length;
@ -73,7 +71,7 @@ const SGUIScrollBarStyle *IGUIScrollBar::GetStyle() const
if (!m_pHostObject)
return NULL;
return m_pHostObject->GetScrollBarStyle(m_ScrollBarStyle);
return m_pHostObject->GetScrollBarStyle(m_ScrollBarStyle);
}
CGUI *IGUIScrollBar::GetGUI() const

4
source/gui/IGUIScrollBar.h
View File

@ -105,7 +105,7 @@ struct SGUIScrollBarStyle
//@}
//--------------------------------------------------------
/** @name Horizontal Sprites */
/** @name Vertical Sprites */
//--------------------------------------------------------
//@{
@ -127,7 +127,7 @@ struct SGUIScrollBarStyle
//@}
//--------------------------------------------------------
/** @name Vertical Sprites */
/** @name Horizontal Sprites */
//--------------------------------------------------------
//@{