[Wesnoth-cvs-commits] wesnoth/src/widgets scrollarea.cpp widget.hpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/11/06 20:03:56

Modified files:
        src/widgets    : scrollarea.cpp widget.hpp 

Log message:
        Fix scrollbar not showing up in help text area. A bit hckish.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollarea.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/widget.hpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: wesnoth/src/widgets/scrollarea.cpp
diff -u wesnoth/src/widgets/scrollarea.cpp:1.2 
wesnoth/src/widgets/scrollarea.cpp:1.3
--- wesnoth/src/widgets/scrollarea.cpp:1.2      Sat Nov  6 13:13:16 2004
+++ wesnoth/src/widgets/scrollarea.cpp  Sat Nov  6 20:03:56 2004
@@ -1,4 +1,4 @@
-/* $Id: scrollarea.cpp,v 1.2 2004/11/06 13:13:16 silene Exp $*/
+/* $Id: scrollarea.cpp,v 1.3 2004/11/06 20:03:56 silene Exp $*/
 /*
    Copyright (C) 2004 by Guillaume Melquiond <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -54,8 +54,11 @@
        if (recursive_)
                return;
        recursive_ = true;
-       if (shown_scrollbar_ != has_scrollbar())
-               set_location(location());
+       if (shown_scrollbar_ != has_scrollbar()) {
+               bg_restore();
+               bg_cancel();
+               update_location(location());
+       }
        recursive_ = false;
 }
 
Index: wesnoth/src/widgets/widget.hpp
diff -u wesnoth/src/widgets/widget.hpp:1.21 wesnoth/src/widgets/widget.hpp:1.22
--- wesnoth/src/widgets/widget.hpp:1.21 Sat Nov  6 13:42:25 2004
+++ wesnoth/src/widgets/widget.hpp      Sat Nov  6 20:03:56 2004
@@ -60,6 +60,8 @@
        void bg_register(SDL_Rect const &rect);
        void bg_restore() const;
        void bg_restore(SDL_Rect const &rect) const;
+       void bg_update();
+       void bg_cancel();
 
        display& disp() const { return *disp_; }
 
@@ -73,9 +75,6 @@
        void volatile_draw();
        void volatile_undraw();
 
-       void bg_update();
-       void bg_cancel();
-
        display* disp_;
        std::vector< surface_restorer > restorer_;
        SDL_Rect rect_;