Author: mordante
Date: Sat Oct 11 21:54:00 2008
New Revision: 30058
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30058&view=rev
Log:
Rename foo_content_bar to content_foo_bar.
Only a mechanical cleanup to get better names for functions, has no
runtime changes.
Modified:
trunk/src/gui/widgets/listbox.cpp
trunk/src/gui/widgets/listbox.hpp
trunk/src/gui/widgets/scroll_label.cpp
trunk/src/gui/widgets/scroll_label.hpp
trunk/src/gui/widgets/vertical_scrollbar_container.cpp
trunk/src/gui/widgets/vertical_scrollbar_container.hpp
Modified: trunk/src/gui/widgets/listbox.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/listbox.cpp?rev=30058&r1=30057&r2=30058&view=diff
==============================================================================
--- trunk/src/gui/widgets/listbox.cpp (original)
+++ trunk/src/gui/widgets/listbox.cpp Sat Oct 11 21:54:00 2008
@@ -199,13 +199,13 @@
tgrid* tlistbox::find_list(const bool must_exist)
{
tgrid* result = find_widget<tgrid>("_list", false, false);
- return result ? result : find_content_grid(must_exist);
+ return result ? result : content_find_grid(must_exist);
}
const tgrid* tlistbox::find_list(const bool must_exist) const
{
const tgrid* result = find_widget<const tgrid>("_list", false, false);
- return result ? result : find_content_grid(must_exist);
+ return result ? result : content_find_grid(must_exist);
}
void tlistbox::draw_list_area_fixed_row_height(surface& surface,
@@ -406,11 +406,11 @@
}
}
-tpoint tlistbox::get_content_best_size(const tpoint& maximum_size) const
+tpoint tlistbox::content_get_best_size(const tpoint& maximum_size) const
{
log_scope2(gui_layout, std::string("tlistbox ") + __func__);
- tpoint best_size = get_content_best_size();
+ tpoint best_size = content_get_best_size();
// We can only reduce our height so we ignore the x value.
// NOTE we might later be able to reduce our width as well, but that's
@@ -422,7 +422,7 @@
tpoint max = maximum_size;
// Adjust for the size of the header and footer.
- const tpoint base = find_content_grid()->get_best_size();
+ const tpoint base = content_find_grid()->get_best_size();
max.y -= base.y;
if(base.x > max.x) {
max.x = base.x;
@@ -447,13 +447,13 @@
return best_size;
}
-tpoint tlistbox::get_content_best_size() const
+tpoint tlistbox::content_get_best_size() const
{
log_scope2(gui_layout, std::string("tlistbox ") + __func__);
// First determine the size wanted for the grid, which is used when
header
// or footer are used.
- const tpoint base = find_content_grid()->get_best_size();
+ const tpoint base = content_find_grid()->get_best_size();
unsigned width = base.x;
unsigned height = base.y;
@@ -472,7 +472,7 @@
return tpoint(width, height);
}
-void tlistbox::set_content_size(const SDL_Rect& rect)
+void tlistbox::content_set_size(const SDL_Rect& rect)
{
unsigned total_height = 0;
foreach(trow& row, rows_) {
@@ -514,14 +514,14 @@
// Handle our full redraw for the spacer area.
if(!list_background_) {
list_background_.assign(
- gui2::save_background(surface,
find_content_grid()->get_rect()));
+ gui2::save_background(surface,
content_find_grid()->get_rect()));
} else {
gui2::restore_background(
- list_background_, surface,
find_content_grid()->get_rect());
+ list_background_, surface,
content_find_grid()->get_rect());
}
// draw header and footer.
- find_content_grid()->draw(surface, force, invalidate_background);
+ content_find_grid()->draw(surface, force, invalidate_background);
// Now paint the list
if(assume_fixed_row_size_) {
@@ -532,13 +532,13 @@
}
}
-twidget* tlistbox::find_content_widget(
+twidget* tlistbox::content_find_widget(
const tpoint& coordinate, const bool must_be_active)
{
int offset = 0;
tpoint coord = coordinate;
- coord.y -= find_list()->get_rect().y -
find_content_grid()->get_rect().y;
+ coord.y -= find_list()->get_rect().y -
content_find_grid()->get_rect().y;
const size_t row = row_at_offset(coord.y, offset);
if(row == static_cast<size_t>(-1)) {
@@ -551,12 +551,12 @@
tpoint(coordinate.x, offset), must_be_active);
}
-const twidget* tlistbox::find_content_widget(
+const twidget* tlistbox::content_find_widget(
const tpoint& coordinate, const bool must_be_active) const
{
int offset = 0;
tpoint coord = coordinate;
- coord.y -= find_list()->get_rect().y -
find_content_grid()->get_rect().y;
+ coord.y -= find_list()->get_rect().y -
content_find_grid()->get_rect().y;
const size_t row = row_at_offset(coord.y, offset);
if(row == static_cast<size_t>(-1)) {
Modified: trunk/src/gui/widgets/listbox.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/listbox.hpp?rev=30058&r1=30057&r2=30058&view=diff
==============================================================================
--- trunk/src/gui/widgets/listbox.hpp (original)
+++ trunk/src/gui/widgets/listbox.hpp Sat Oct 11 21:54:00 2008
@@ -348,24 +348,24 @@
{ static const std::string type = "listbox"; return type; }
/** Inherited from tvertical_scrollbar_container_. */
- tpoint get_content_best_size(const tpoint& maximum_size) const;
-
- /** Inherited from tvertical_scrollbar_container_. */
- tpoint get_content_best_size() const;
-
- /** Inherited from tvertical_scrollbar_container_. */
- void set_content_size(const SDL_Rect& rect);
+ tpoint content_get_best_size(const tpoint& maximum_size) const;
+
+ /** Inherited from tvertical_scrollbar_container_. */
+ tpoint content_get_best_size() const;
+
+ /** Inherited from tvertical_scrollbar_container_. */
+ void content_set_size(const SDL_Rect& rect);
/** Inherited from tvertical_scrollbar_container_. */
void draw_content(surface& surface, const bool force = false,
const bool invalidate_background = false);
/** Inherited from tvertical_scrollbar_container_. */
- twidget* find_content_widget(
+ twidget* content_find_widget(
const tpoint& coordinate, const bool must_be_active);
/** Inherited from tvertical_scrollbar_container_. */
- const twidget* find_content_widget(const tpoint& coordinate,
+ const twidget* content_find_widget(const tpoint& coordinate,
const bool must_be_active) const;
};
Modified: trunk/src/gui/widgets/scroll_label.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scroll_label.cpp?rev=30058&r1=30057&r2=30058&view=diff
==============================================================================
--- trunk/src/gui/widgets/scroll_label.cpp (original)
+++ trunk/src/gui/widgets/scroll_label.cpp Sat Oct 11 21:54:00 2008
@@ -88,7 +88,7 @@
label_->set_can_wrap(true);
}
-bool tscroll_label::set_content_width_constrain(const unsigned width)
+bool tscroll_label::content_set_width_constrain(const unsigned width)
{
bool result = !label_ ? true : label_->set_width_constrain(width);
@@ -99,14 +99,14 @@
return result;
}
-void tscroll_label::clear_content_width_constrain()
+void tscroll_label::content_clear_width_constrain()
{
if(label_) {
label_->clear_width_constrain();
}
}
-tpoint tscroll_label::get_content_best_size(const tpoint& maximum_size) const
+tpoint tscroll_label::content_get_best_size(const tpoint& maximum_size) const
{
assert(label_);
@@ -119,7 +119,7 @@
return result;
}
-tpoint tscroll_label::get_content_best_size() const
+tpoint tscroll_label::content_get_best_size() const
{
assert(label_);
@@ -130,7 +130,7 @@
return result;
}
-void tscroll_label::set_content_size(const SDL_Rect& rect)
+void tscroll_label::content_set_size(const SDL_Rect& rect)
{
assert(label_);
@@ -153,7 +153,7 @@
{
assert(label_);
if(label_ == NULL) {
- find_content_grid()->draw(surf, force, invalidate_background);
+ content_find_grid()->draw(surf, force, invalidate_background);
return;
}
@@ -173,13 +173,13 @@
blit_surface(label_surf, &src_rect , surf, &dst_rect);
}
-twidget* tscroll_label::find_content_widget(
+twidget* tscroll_label::content_find_widget(
const tpoint& /*coordinate*/, const bool /*must_be_active*/)
{
return label_;
}
-const twidget* tscroll_label::find_content_widget(const tpoint&
/*coordinate*/,
+const twidget* tscroll_label::content_find_widget(const tpoint&
/*coordinate*/,
const bool /*must_be_active*/) const
{
return label_;
Modified: trunk/src/gui/widgets/scroll_label.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scroll_label.hpp?rev=30058&r1=30057&r2=30058&view=diff
==============================================================================
--- trunk/src/gui/widgets/scroll_label.hpp (original)
+++ trunk/src/gui/widgets/scroll_label.hpp Sat Oct 11 21:54:00 2008
@@ -102,33 +102,33 @@
{ static const std::string type = "scroll_label"; return type; }
/** Inherited from tvertical_scrollbar_container_. */
- bool can_content_wrap() const { return true; }
+ bool content_can_wrap() const { return true; }
/** Inherited from tvertical_scrollbar_container_. */
- bool set_content_width_constrain(const unsigned width);
+ bool content_set_width_constrain(const unsigned width);
/** Inherited from tvertical_scrollbar_container_. */
- void clear_content_width_constrain();
+ void content_clear_width_constrain();
/** Inherited from tvertical_scrollbar_container_. */
- tpoint get_content_best_size(const tpoint& maximum_size) const;
+ tpoint content_get_best_size(const tpoint& maximum_size) const;
/** Inherited from tvertical_scrollbar_container_. */
- tpoint get_content_best_size() const;
+ tpoint content_get_best_size() const;
/** Inherited from tvertical_scrollbar_container_. */
- void set_content_size(const SDL_Rect& rect);
+ void content_set_size(const SDL_Rect& rect);
/** Inherited from tvertical_scrollbar_container_. */
void draw_content(surface& surface, const bool force = false,
const bool invalidate_background = false);
/** Inherited from tvertical_scrollbar_container_. */
- twidget* find_content_widget(
+ twidget* content_find_widget(
const tpoint& coordinate, const bool must_be_active);
/** Inherited from tvertical_scrollbar_container_. */
- const twidget* find_content_widget(const tpoint& coordinate,
+ const twidget* content_find_widget(const tpoint& coordinate,
const bool must_be_active) const;
};
Modified: trunk/src/gui/widgets/vertical_scrollbar_container.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/vertical_scrollbar_container.cpp?rev=30058&r1=30057&r2=30058&view=diff
==============================================================================
--- trunk/src/gui/widgets/vertical_scrollbar_container.cpp (original)
+++ trunk/src/gui/widgets/vertical_scrollbar_container.cpp Sat Oct 11 21:54:00
2008
@@ -164,7 +164,7 @@
const unsigned scrollbar_width = scrollbar_mode_ == HIDE
? 0 : find_scrollbar_grid()->get_best_size().x;
- const bool result = set_content_width_constrain(width -
scrollbar_width);
+ const bool result = content_set_width_constrain(width -
scrollbar_width);
DBG_G_L << "tvertical_scrollbar_container_ "
<< " width " << width
@@ -179,7 +179,7 @@
log_scope2(gui_layout,
std::string("tvertical_scrollbar_container_ ") + __func__);
- const tpoint content = get_content_best_size();
+ const tpoint content = content_get_best_size();
if(scrollbar_mode_ == HIDE) {
DBG_G_L << "tvertical_scrollbar_container_ result " << content
<< ".\n";
return content;
@@ -216,14 +216,14 @@
// No scrollbar hope the normal size is small enough. Don't
send the
// maximum_size parameter since then the content 'thinks' there
will be
// a scrollbar.
- const tpoint result = get_content_best_size();
+ const tpoint result = content_get_best_size();
DBG_G_L << "tvertical_scrollbar_container_ result " << result
<< ".\n";
return result;
} else {
// The scrollbar also can't be resized so ask the best size.
const tpoint scrollbar = find_scrollbar_grid()->get_best_size();
- const tpoint content = get_content_best_size(tpoint(
+ const tpoint content = content_get_best_size(tpoint(
maximum_size.x - scrollbar.x, maximum_size.y));
// Width and height same rules as above.
@@ -250,7 +250,7 @@
// Test whether we need a scrollbar.
bool scrollbar_needed = (scrollbar_mode_ == SHOW);
if(scrollbar_mode_ == SHOW_WHEN_NEEDED) {
- tpoint size = get_content_best_size();
+ tpoint size = content_get_best_size();
scrollbar_needed = size.x > rect.w || size.y > rect.h;
}
@@ -266,14 +266,14 @@
tmp = rect;
tmp.w -= scrollbar.x;
- find_content_grid()->set_size(tmp);
- set_content_size(tmp);
+ content_find_grid()->set_size(tmp);
+ content_set_size(tmp);
} else {
show_scrollbar(false);
- find_content_grid()->set_size(rect);
- set_content_size(rect);
+ content_find_grid()->set_size(rect);
+ content_set_size(rect);
}
set_scrollbar_button_status();
@@ -295,11 +295,11 @@
twidget* tvertical_scrollbar_container_::find_widget(
const tpoint& coordinate, const bool must_be_active)
{
- SDL_Rect content = find_content_grid()->get_rect();
+ SDL_Rect content = content_find_grid()->get_rect();
if(point_in_rect(coordinate.x, coordinate.y, content)) {
- return find_content_widget(tpoint(
+ return content_find_widget(tpoint(
coordinate.x - get_x(), coordinate.y - get_y())
, must_be_active);
}
@@ -311,11 +311,11 @@
const twidget* tvertical_scrollbar_container_::find_widget(
const tpoint& coordinate, const bool must_be_active) const
{
- SDL_Rect content = find_content_grid()->get_rect();
+ SDL_Rect content = content_find_grid()->get_rect();
if(point_in_rect(coordinate.x, coordinate.y, content)) {
- return find_content_widget(tpoint(
+ return content_find_widget(tpoint(
coordinate.x - get_x(), coordinate.y - get_y())
, must_be_active);
}
@@ -357,13 +357,13 @@
->find_widget<const tscrollbar_>("_scrollbar", false, must_exist);
}
-tgrid* tvertical_scrollbar_container_::find_content_grid(const bool must_exist)
+tgrid* tvertical_scrollbar_container_::content_find_grid(const bool must_exist)
{
return find_widget<tgrid>("_content_grid", false, must_exist);
}
const tgrid* tvertical_scrollbar_container_::
- find_content_grid(const bool must_exist) const
+ content_find_grid(const bool must_exist) const
{
return find_widget<tgrid>("_content_grid", false, must_exist);
}
@@ -431,7 +431,7 @@
// Make sure all mandatory widgets are tested
find_scrollbar_grid();
- find_content_grid();
+ content_find_grid();
// Call the virtual function to subclasses can do their finalization
part.
finalize();
Modified: trunk/src/gui/widgets/vertical_scrollbar_container.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/vertical_scrollbar_container.hpp?rev=30058&r1=30057&r2=30058&view=diff
==============================================================================
--- trunk/src/gui/widgets/vertical_scrollbar_container.hpp (original)
+++ trunk/src/gui/widgets/vertical_scrollbar_container.hpp Sat Oct 11 21:54:00
2008
@@ -77,13 +77,13 @@
SDLKey key, SDLMod modifier, Uint16 unicode);
/** Inherited from twidget. */
- bool can_wrap() const { return can_content_wrap(); }
+ bool can_wrap() const { return content_can_wrap(); }
/** Inherited from twidget. */
bool set_width_constrain(const unsigned width);
/** Inherited from twidget. */
- void clear_width_constrain() { clear_content_width_constrain(); }
+ void clear_width_constrain() { content_clear_width_constrain(); }
/** Inherited from twidget. */
bool has_vertical_scrollbar() const { return true; }
@@ -161,8 +161,8 @@
const tscrollbar_* find_scrollbar(const bool must_exist = true) const;
/** See find_scrollbar_grid, but returns the content grid instead. */
- tgrid* find_content_grid(const bool must_exist = true);
- const tgrid* find_content_grid(const bool must_exist = true) const;
+ tgrid* content_find_grid(const bool must_exist = true);
+ const tgrid* content_find_grid(const bool must_exist = true) const;
/**
* Sets the status of the scrollbar buttons.
@@ -230,14 +230,14 @@
*
* See can_wrap() for more info.
*/
- virtual bool can_content_wrap() const { return false; }
+ virtual bool content_can_wrap() const { return false; }
/**
* Sets the content width constrain.
*
* See set_width_contrain() for more info.
*/
- virtual bool set_content_width_constrain(const unsigned /*width*/)
+ virtual bool content_set_width_constrain(const unsigned /*width*/)
{return false; }
/**
@@ -245,21 +245,21 @@
*
* See clear_width_constrain() for more info.
*/
- virtual void clear_content_width_constrain() {}
+ virtual void content_clear_width_constrain() {}
/**
* Returns the best size for the content part.
*
* See get_best_size() for more info.
*/
- virtual tpoint get_content_best_size() const = 0;
+ virtual tpoint content_get_best_size() const = 0;
/**
* Returns the best size for the content part.
*
* See get_best_size(cont tpoint&) for more info.
*/
- virtual tpoint get_content_best_size(const tpoint& maximum_size) const
= 0;
+ virtual tpoint content_get_best_size(const tpoint& maximum_size) const
= 0;
/**
* Sets the size for the content.
@@ -269,7 +269,7 @@
*
* @param rect The new size of the content grid.
*/
- virtual void set_content_size(const SDL_Rect& rect) = 0;
+ virtual void content_set_size(const SDL_Rect& rect) = 0;
/**
* Draws the content part of the widget.
@@ -282,13 +282,13 @@
/**
* Finds a widget in the content area.
*
- * See find_content_widget for more info.
- */
- virtual twidget* find_content_widget(
+ * See content_find_widget for more info.
+ */
+ virtual twidget* content_find_widget(
const tpoint& coordinate, const bool must_be_active) = 0;
/** The const version. */
- virtual const twidget* find_content_widget(
+ virtual const twidget* content_find_widget(
const tpoint& coordinate, const bool must_be_active) const = 0;
};
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
