0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Workaround for bug #24780, courtesy of gfgtdf

Browse source 
This isn't the cleanest fix, but it suffices for now.
This commit is contained in:
Charles Dang 2016-08-13 07:54:32 +11:00
parent 265e41dbda
commit f5210fa39d
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gui/widgets/scrollbar_container.cpp
View file

@ -324,10 +324,22 @@ tpoint tscrollbar_container::calculate_best_size() const
assert(content_grid_);
const tpoint content = content_grid_->get_best_size();
const tpoint result(
tpoint result(
vertical_scrollbar.x + std::max(horizontal_scrollbar.x, content.x),
horizontal_scrollbar.y + std::max(vertical_scrollbar.y, content.y));
//
// Workaround for bug #24780. This should probably be moved somewhere more specific to
// the listbox, but for now it suffices.
//
if(const tgrid* header = find_widget<const tgrid>(&grid(), "_header_grid", false, false)) {
result.y += header->get_best_size().y;
}
if(const tgrid* footer = find_widget<const tgrid>(&grid(), "_footer_grid", false, false)) {
result.y += footer->get_best_size().y;
}
DBG_GUI_L << LOG_HEADER << " vertical_scrollbar " << vertical_scrollbar
<< " horizontal_scrollbar " << horizontal_scrollbar << " content "
<< content << " result " << result << ".\n";