mail[Wesnoth-commits] r40385 - in /trunk/src/gui/widgets: widget.cpp window.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on December 25, 2009 - 10:47:
Author: mordante
Date: Fri Dec 25 10:47:34 2009
New Revision: 40385

URL: http://svn.gna.org/viewcvs/wesnoth?rev=40385&view=rev
Log:
Fix the disappearing icons in the campaign dialog.

Seems the changes in r40311 are not needed and break things so revert
that and revert r40317 which is no longer needed. Fixes bug #14983.

Modified:
    trunk/src/gui/widgets/widget.cpp
    trunk/src/gui/widgets/window.cpp

Modified: trunk/src/gui/widgets/widget.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/widget.cpp?rev=40385&r1=40384&r2=40385&view=diff
==============================================================================
--- trunk/src/gui/widgets/widget.cpp (original)
+++ trunk/src/gui/widgets/widget.cpp Fri Dec 25 10:47:34 2009
@@ -182,7 +182,7 @@
 {
        assert(call_stack.empty() || call_stack.back() != this);
 
-       if(visible_ == twidget::INVISIBLE) {
+       if(visible_ != VISIBLE) {
                return;
        }
 

Modified: trunk/src/gui/widgets/window.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/window.cpp?rev=40385&r1=40384&r2=40385&view=diff
==============================================================================
--- trunk/src/gui/widgets/window.cpp (original)
+++ trunk/src/gui/widgets/window.cpp Fri Dec 25 10:47:34 2009
@@ -659,7 +659,7 @@
 
        std::vector<twidget*> call_stack;
        populate_dirty_list(*this, call_stack);
-       //assert(dirty_list_.empty());
+       assert(dirty_list_.empty());
 
        SDL_Rect rect = get_rect();
        update_rect(rect);




Related Messages


Powered by MHonArc, Updated Fri Dec 25 11:00:12 2009