Author: mordante
Date: Sun May 24 15:49:43 2009
New Revision: 35877
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35877&view=rev
Log:
Widget visible helper function cleanup [1/2].
Remove twidget::is_visible(). The function is not really useful with the
hidden visibility status since it's not directly clear when something is
visible or invisible, so rather explicitely test for values.
Part 2 will remove twidget::is_invisible().
Modified:
trunk/src/gui/widgets/grid.cpp
trunk/src/gui/widgets/scrollbar_container.cpp
trunk/src/gui/widgets/widget.cpp
trunk/src/gui/widgets/widget.hpp
trunk/src/gui/widgets/window.cpp
Modified: trunk/src/gui/widgets/grid.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/grid.cpp?rev=35877&r1=35876&r2=35877&view=diff
==============================================================================
--- trunk/src/gui/widgets/grid.cpp (original)
+++ trunk/src/gui/widgets/grid.cpp Sun May 24 15:49:43 2009
@@ -832,7 +832,7 @@
twidget* widget = child.widget();
assert(widget);
- if(!widget->is_visible()) {
+ if(widget->get_visible() != twidget::VISIBLE) {
continue;
}
Modified: trunk/src/gui/widgets/scrollbar_container.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scrollbar_container.cpp?rev=35877&r1=35876&r2=35877&view=diff
==============================================================================
--- trunk/src/gui/widgets/scrollbar_container.cpp (original)
+++ trunk/src/gui/widgets/scrollbar_container.cpp Sun May 24 15:49:43 2009
@@ -328,7 +328,7 @@
set_scrollbar_button_status();
// Set the easy close status.
- set_block_easy_close(is_visible()
+ set_block_easy_close(get_visible() == twidget::VISIBLE
&& get_active() && does_block_easy_close());
// Now set the visible part of the content.
@@ -438,11 +438,13 @@
&& horizontal_scrollbar_grid_
&& horizontal_scrollbar_);
- const bool vertical_block = vertical_scrollbar_grid_->is_visible()
+ const bool vertical_block =
+ vertical_scrollbar_grid_->get_visible() ==
twidget::VISIBLE
&& !(vertical_scrollbar_->at_begin()
&& vertical_scrollbar_->at_end());
- const bool horizontal_block = horizontal_scrollbar_grid_->is_visible()
+ const bool horizontal_block =
+ horizontal_scrollbar_grid_->get_visible() ==
twidget::VISIBLE
&& !(horizontal_scrollbar_->at_begin()
&& horizontal_scrollbar_->at_end());
@@ -528,7 +530,7 @@
content_grid_->set_parent(this);
/***** Set the easy close status. *****/
- set_block_easy_close(is_visible()
+ set_block_easy_close(get_visible() == twidget::VISIBLE
&& get_active() && does_block_easy_close());
/***** Let our subclasses initialize themselves. *****/
@@ -680,7 +682,7 @@
{
assert(vertical_scrollbar_grid_ && vertical_scrollbar_);
- if(vertical_scrollbar_grid_->is_visible()) {
+ if(vertical_scrollbar_grid_->get_visible() == twidget::VISIBLE) {
vertical_scrollbar_->scroll(tscrollbar_::HALF_JUMP_BACKWARDS);
scrollbar_moved();
handled = true;
@@ -692,7 +694,7 @@
{
assert(vertical_scrollbar_grid_ && vertical_scrollbar_);
- if(vertical_scrollbar_grid_->is_visible()) {
+ if(vertical_scrollbar_grid_->get_visible() == twidget::VISIBLE) {
vertical_scrollbar_->scroll(tscrollbar_::HALF_JUMP_FORWARD);
scrollbar_moved();
handled = true;
@@ -704,7 +706,7 @@
{
assert(horizontal_scrollbar_grid_ && horizontal_scrollbar_);
- if(horizontal_scrollbar_grid_->is_visible()) {
+ if(horizontal_scrollbar_grid_->get_visible() == twidget::VISIBLE) {
horizontal_scrollbar_->scroll(tscrollbar_::HALF_JUMP_BACKWARDS);
scrollbar_moved();
handled = true;
@@ -716,7 +718,7 @@
{
assert(horizontal_scrollbar_grid_ && horizontal_scrollbar_);
- if(horizontal_scrollbar_grid_->is_visible()) {
+ if(horizontal_scrollbar_grid_->get_visible() == twidget::VISIBLE) {
horizontal_scrollbar_->scroll(tscrollbar_::HALF_JUMP_FORWARD);
scrollbar_moved();
handled = true;
Modified: trunk/src/gui/widgets/widget.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/widget.cpp?rev=35877&r1=35876&r2=35877&view=diff
==============================================================================
--- trunk/src/gui/widgets/widget.cpp (original)
+++ trunk/src/gui/widgets/widget.cpp Sun May 24 15:49:43 2009
@@ -136,7 +136,7 @@
void twidget::populate_dirty_list(twindow& caller,
std::vector<twidget*>& call_stack)
{
- if(!is_visible()) {
+ if(visible_ != twidget::VISIBLE) {
return;
}
Modified: trunk/src/gui/widgets/widget.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/widget.hpp?rev=35877&r1=35876&r2=35877&view=diff
==============================================================================
--- trunk/src/gui/widgets/widget.hpp (original)
+++ trunk/src/gui/widgets/widget.hpp Sun May 24 15:49:43 2009
@@ -475,13 +475,6 @@
tvisible get_visible() const { return visible_; }
/**
- * Returns true if the widget is visible.
- *
- * @deprecated This function name and action is too confusing.
- */
- bool is_visible() const { return visible_ == VISIBLE; }
-
- /**
* Returns true if the widget is invisible.
*
* @deprecated This function name and action is too confusing.
Modified: trunk/src/gui/widgets/window.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/window.cpp?rev=35877&r1=35876&r2=35877&view=diff
==============================================================================
--- trunk/src/gui/widgets/window.cpp (original)
+++ trunk/src/gui/widgets/window.cpp Sun May 24 15:49:43 2009
@@ -458,7 +458,7 @@
populate_dirty_list(*this, call_stack);
}
- if(tooltip_.is_visible() && tooltip_.get_dirty()) {
+ if(tooltip_.get_visible() == twidget::VISIBLE && tooltip_.get_dirty()) {
dirty_list_.push_back(std::vector<twidget*>(1, &tooltip_));
}
@@ -519,7 +519,7 @@
for(std::vector<twidget*>::iterator itor = item.begin();
itor != item.end(); ++itor) {
- if(!(**itor).is_visible()
+ if((**itor).get_visible() != twidget::VISIBLE
|| (**itor).get_drawing_action() ==
twidget::NOT_DRAWN) {
item.erase(itor, item.end());
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
