Author: mordante
Date: Mon Nov 24 20:54:36 2008
New Revision: 31058
URL: http://svn.gna.org/viewcvs/wesnoth?rev=31058&view=rev
Log:
Fix easy_close behaviour for vertical_scrollbar_container.
Modified:
trunk/src/gui/widgets/vertical_scrollbar_container.cpp
trunk/src/gui/widgets/vertical_scrollbar_container.hpp
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=31058&r1=31057&r2=31058&view=diff
==============================================================================
--- trunk/src/gui/widgets/vertical_scrollbar_container.cpp (original)
+++ trunk/src/gui/widgets/vertical_scrollbar_container.cpp Mon Nov 24 20:54:36
2008
@@ -198,6 +198,7 @@
content_set_size(create_rect(origin, size));
}
+ set_block_easy_close(get_visible() && get_active() &&
does_block_easy_close());
set_scrollbar_button_status();
}
@@ -335,6 +336,17 @@
return tcontainer_::find_widget(coordinate, must_be_active);
}
+bool tvertical_scrollbar_container_::does_block_easy_close() const
+{
+ if(scrollbar_grid_) {
+ // scrollbar is hidden.
+ return false;
+ } else {
+ // scrollbar is visible.
+ return find_scrollbar()->get_active();
+ }
+}
+
void tvertical_scrollbar_container_::value_changed()
{
if(callback_value_change_) {
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=31058&r1=31057&r2=31058&view=diff
==============================================================================
--- trunk/src/gui/widgets/vertical_scrollbar_container.hpp (original)
+++ trunk/src/gui/widgets/vertical_scrollbar_container.hpp Mon Nov 24 20:54:36
2008
@@ -123,6 +123,9 @@
/** Import overloaded versions. */
using tcontainer_::find_widget;
+ /** Inherited from tcontainer_. */
+ bool does_block_easy_close() const;
+
/***** ***** ***** setters / getters for members ***** ****** *****/
void set_callback_value_change(void (*callback) (twidget* caller))
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
