Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Don't subtract the scrollbar size from GUI dropdowns when there is no scrollbar. Patch by Imarok, reviewed by mimo, refs #3571.

Browse Source 
Remove unused button_width.

This was SVN commit r18984.
This commit is contained in:
elexis 2016-11-22 13:05:56 +00:00
parent 0b03713b3b
commit aa7e2fce49
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/CDropDown.cpp
View File

@ -382,24 +382,22 @@ InReaction CDropDown::ManuallyHandleEvent(const SDL_Event_* ev)
void CDropDown::SetupListRect()
{
float size, buffer, button_width;
float size, buffer;
GUI<float>::GetSetting(this, "dropdown_size", size);
GUI<float>::GetSetting(this, "dropdown_buffer", buffer);
GUI<float>::GetSetting(this, "button_width", button_width);
if (m_ItemsYPositions.empty() || m_ItemsYPositions.back() >= size)
{
m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom+buffer,
m_CachedActualSize.right, m_CachedActualSize.bottom+buffer + size);
m_CachedActualSize.right, m_CachedActualSize.bottom+buffer + size);
m_HideScrollBar = false;
}
else
{
m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom+buffer,
m_CachedActualSize.right - GetScrollBar(0).GetStyle()->m_Width, m_CachedActualSize.bottom+buffer + m_ItemsYPositions.back());
m_CachedActualSize.right, m_CachedActualSize.bottom+buffer + m_ItemsYPositions.back());
// We also need to hide the scrollbar
m_HideScrollBar = true;
}
}