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

Adding comment.

Browse source
This commit is contained in:
Mark de Wever 2008-06-18 17:50:20 +00:00
parent 4a0bd07507
commit f9a6bc2b94
2 changed files with 44 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/widgets/container.cpp
View file

@ -39,14 +39,6 @@
namespace gui2 {
void tcontainer_::draw(surface& surface)
{
// Inherited.
tcontrol::draw(surface);
grid_.draw(surface);
}
tpoint tcontainer_::get_minimum_size() const
{
tpoint size = grid_.get_maximum_size();
@ -79,5 +71,13 @@ tpoint tcontainer_::get_best_size() const
return size;
}
void tcontainer_::draw(surface& surface)
{
// Inherited.
tcontrol::draw(surface);
grid_.draw(surface);
}
} // namespace gui2

66
src/gui/widgets/container.hpp
View file

@ -36,9 +36,35 @@ public:
grid_.set_parent(this);
}
virtual SDL_Rect get_client_rect() const { return get_rect(); }
/***** ***** ***** ***** Inherited ***** ***** ***** *****/
/**
* Inherited from twidget.
*
* Since we can't define a good default behaviour we force the inheriting
* classes to define this function. So inheriting classes act as one widget
* others as a collection of multiple objects.
*/
bool has_vertical_scrollbar() const = 0;
/** Inherited from twidget.*/
bool has_widget(const twidget* widget) const
{ return grid_.has_widget(widget); }
/** Inherited from twidget. */
bool dirty() const { return twidget::dirty() || grid_.dirty(); }
/** Inherited from tcontrol. */
tpoint get_minimum_size() const;
/** Inherited from tcontrol. */
tpoint get_best_size() const;
/** Inherited from tcontrol. */
void draw(surface& surface);
/** Inherited from tcontrol. */
twidget* find_widget(const tpoint& coordinate, const bool must_be_active)
{ return grid_.find_widget(coordinate, must_be_active); }
@ -61,26 +87,7 @@ public:
const twidget* result = tcontrol::find_widget(id, must_be_active);
return result ? result : grid_.find_widget(id, must_be_active);
}
/** Inherited from twidget.*/
bool has_widget(const twidget* widget) const
{ return grid_.has_widget(widget); }
/**
* Inherited from twidget.
*
* Since we can't define a good default behaviour we force the inheriting
* classes to define this function. So inheriting classes act as one widget
* others as a collection of multiple objects.
*/
bool has_vertical_scrollbar() const = 0;
/** Inherited from tcontrol. */
tpoint get_minimum_size() const;
/** Inherited from tcontrol. */
tpoint get_best_size() const;
/** Inherited from tcontrol. */
void set_size(const SDL_Rect& rect)
{
@ -88,13 +95,7 @@ public:
set_client_size(get_client_rect());
}
/** FIXME see whether needed to be exported. */
void set_client_size(const SDL_Rect& rect) { grid_.set_size(rect); }
/** Inherited from tcontrol. */
void draw(surface& surface);
/***** **** wrappers to the grid **** ****/
/***** **** ***** ***** wrappers to the grid **** ********* *****/
tgrid::iterator begin() { return grid_.begin(); }
tgrid::iterator end() { return grid_.end(); }
@ -121,16 +122,22 @@ public:
void set_col_grow_factor(const unsigned col, const unsigned factor)
{ grid_.set_col_grow_factor(col, factor); }
virtual SDL_Rect get_client_rect() const { return get_rect(); }
/** FIXME see whether needed to be exported. */
void set_client_size(const SDL_Rect& rect) { grid_.set_size(rect); }
protected:
/***** ***** ***** setters / getters for members ***** ****** *****/
const tgrid& grid() const { return grid_; }
tgrid& grid() { return grid_; }
private:
/** The grid which holds the child objects. */
tgrid grid_;
//! Returns the space used by the border.
/** Returns the space used by the border. */
virtual tpoint border_space() const { return tpoint(0, 0); }
};
@ -138,4 +145,3 @@ private:
#endif