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

Let content_resize_request() return a status.

Browse source 
This allows classes the try to handle the resize know whether suceeded
or not.
This commit is contained in:
Mark de Wever 2009-12-20 19:35:06 +00:00
parent e45d341f6a
commit c0d4476ef1
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,7 +447,7 @@ bool tscrollbar_container::disable_click_dismiss() const
|| content_grid_->disable_click_dismiss();
}
void tscrollbar_container::content_resize_request()
bool tscrollbar_container::content_resize_request()
{
/**
* @todo Try to handle auto_visible_first_run here as well.
@ -470,7 +470,7 @@ void tscrollbar_container::content_resize_request()
if(size == tpoint(0, 0)) {
DBG_GUI_L << LOG_HEADER
<< " initial setup not done, bailing out.\n";
return;
return false;
}
if(best_size.x <= size.x && best_size.y <= size.y) {
@ -480,7 +480,7 @@ void tscrollbar_container::content_resize_request()
goto resize;
}
DBG_GUI_L << LOG_HEADER << " fits, nothing to do.\n";
return;
return true;
}
if(best_size.x > size.x) {
@ -495,7 +495,7 @@ void tscrollbar_container::content_resize_request()
twindow* window = get_window();
assert(window);
window->invalidate_layout();
return;
return false;
}
}
@ -511,13 +511,14 @@ void tscrollbar_container::content_resize_request()
twindow* window = get_window();
assert(window);
window->invalidate_layout();
return;
return false;
}
}
resize:
DBG_GUI_L << LOG_HEADER << " handle resizing.\n";
set_size(get_origin(), get_size());
return true;
}
void tscrollbar_container::vertical_scrollbar_click(twidget* caller)

6
src/gui/widgets/scrollbar_container.hpp
View file

@ -223,8 +223,12 @@ protected:
*
* When a resize is required the container first can try to handle it
* itself before asking the window to do the resize.
*
* @returns True if the resize is handled, false
* otherwise. If the container has no size the
* result is undefined.
*/
void content_resize_request();
bool content_resize_request();
/***** ***** ***** ***** keyboard functions ***** ***** ***** *****/