upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 16:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the scrolling bar for the scroll_label.

Browse Source 
It was broken in the layout engine rewrite. Testing didn't reveal the
problem since it's not used yet.
This commit is contained in:
Mark de Wever 2008-11-23 18:26:02 +00:00
parent 3d3d981dcb
commit 15981a1266
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/widgets/scroll_label.cpp
View File

@ -118,19 +118,31 @@ tpoint tscroll_label::content_calculate_best_size() const
return result;
}
void tscroll_label::
content_use_vertical_scrollbar(const unsigned maximum_height)
{
int width = content_get_best_size().x;
set_content_layout_size(tpoint(width, maximum_height));
}
void tscroll_label::content_set_size(const SDL_Rect& rect)
{
assert(label_);
tpoint label_best_size = label_->get_best_size();
// Set the dummy spacer.
find_spacer()->set_size(tpoint(rect.x, rect.y), tpoint(rect.w, rect.h));
//maybe add a get best height for a label with a given width...
label_->set_size(tpoint(0, 0), tpoint(get_best_size().x, get_best_size().y));
label_->set_size(
tpoint(0, 0),
tpoint(label_best_size.x, label_best_size.y));
tscrollbar_* scrollbar = find_scrollbar(false);
if(scrollbar) {
scrollbar->set_item_count(get_best_size().y);
scrollbar->set_item_count(label_best_size.y);
scrollbar->set_visible_items(rect.h);
}
}

11
src/gui/widgets/scroll_label.hpp
View File

@ -104,16 +104,7 @@ private:
bool content_can_wrap() const { return true; }
/** Inherited from tvertical_scrollbar_container_. */
void content_use_vertical_scrollbar(const unsigned /*maximum_height*/)
{
/*
* FIXME implement, not sure whether it needs to so something.
*
* Probably only set the height of the best_size, maybe optimize so it
* shows entire lines. Evaluate when this code is really tested and
* used.
*/
}
void content_use_vertical_scrollbar(const unsigned maximum_height);
/** Inherited from tvertical_scrollbar_container_. */
void content_set_size(const SDL_Rect& rect);