From 20ad155838f202584cb261ff8a33fd458a04d83f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 6 Apr 2014 11:31:24 +0300
Subject: Move redraw flag from widgets into base widget.

---
 src/gui/widgets/button.cpp            | 5 -----
 src/gui/widgets/button.h              | 1 -
 src/gui/widgets/emotepage.cpp         | 3 +--
 src/gui/widgets/emotepage.h           | 1 -
 src/gui/widgets/popup.cpp             | 3 +--
 src/gui/widgets/popup.h               | 1 -
 src/gui/widgets/progressbar.cpp       | 3 +--
 src/gui/widgets/progressbar.h         | 1 -
 src/gui/widgets/scrollarea.cpp        | 3 +--
 src/gui/widgets/scrollarea.h          | 1 -
 src/gui/widgets/shortcutcontainer.cpp | 3 +--
 src/gui/widgets/shortcutcontainer.h   | 4 ----
 src/gui/widgets/slider.cpp            | 6 ++----
 src/gui/widgets/slider.h              | 1 -
 src/gui/widgets/tabs/tab.cpp          | 1 -
 src/gui/widgets/tabs/tab.h            | 1 -
 src/gui/widgets/widget.cpp            | 3 ++-
 src/gui/widgets/widget.h              | 5 +++++
 src/gui/widgets/window.cpp            | 1 -
 src/gui/widgets/window.h              | 1 -
 20 files changed, 14 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 054a338aa..b1f41e23e 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -127,7 +127,6 @@ Button::Button(const Widget2 *const widget) :
     mYOffset(0),
     mImageWidth(0),
     mImageHeight(0),
-    mRedraw(true),
     mStick(false),
     mPressed(false)
 {
@@ -169,7 +168,6 @@ Button::Button(const Widget2 *const widget,
     mYOffset(0),
     mImageWidth(0),
     mImageHeight(0),
-    mRedraw(true),
     mStick(false),
     mPressed(false)
 {
@@ -217,7 +215,6 @@ Button::Button(const Widget2 *const widget,
     mYOffset(0),
     mImageWidth(imageWidth),
     mImageHeight(imageHeight),
-    mRedraw(true),
     mStick(false),
     mPressed(false)
 {
@@ -265,7 +262,6 @@ Button::Button(const Widget2 *const widget,
     mYOffset(0),
     mImageWidth(imageWidth),
     mImageHeight(imageHeight),
-    mRedraw(true),
     mStick(false),
     mPressed(false)
 {
@@ -313,7 +309,6 @@ Button::Button(const Widget2 *const widget,
     mYOffset(0),
     mImageWidth(0),
     mImageHeight(0),
-    mRedraw(true),
     mStick(false),
     mPressed(false)
 {
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 57a024195..015faf009 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -335,7 +335,6 @@ class Button final : public Widget,
         int mYOffset;
         int mImageWidth;
         int mImageHeight;
-        bool mRedraw;
         bool mStick;
         bool mPressed;
 };
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 789d3e1aa..cbdd50cab 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -42,8 +42,7 @@ EmotePage::EmotePage(const Widget2 *const widget) :
     mEmotes(ResourceManager::getInstance()->getImageSet(
         "graphics/sprites/chatemotes.png", emoteWidth, emoteHeight)),
     mVertexes(new ImageCollection),
-    mSelectedIndex(-1),
-    mRedraw(true)
+    mSelectedIndex(-1)
 {
     addMouseListener(this);
     addWidgetListener(this);
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index 769e004bc..6aca546ca 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -58,7 +58,6 @@ class EmotePage final : public Widget,
         ImageSet *mEmotes;
         ImageCollection *mVertexes;
         int mSelectedIndex;
-        bool mRedraw;
 };
 
 #endif  // GUI_WIDGETS_EMOTEPAGE_H
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 2116de113..3c10a721f 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -43,8 +43,7 @@ Popup::Popup(const std::string &name,
     mMinHeight(40),
     mMaxWidth(mainGraphics->mWidth),
     mMaxHeight(mainGraphics->mHeight),
-    mVertexes(new ImageCollection),
-    mRedraw(true)
+    mVertexes(new ImageCollection)
 {
     logger->log("Popup::Popup(\"%s\")", name.c_str());
 
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 01247cf61..5067b4658 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -187,7 +187,6 @@ class Popup : public Container,
         int mMaxHeight;               /**< Maximum popup height */
 
         ImageCollection *mVertexes;
-        bool mRedraw;
 };
 
 #endif  // GUI_WIDGETS_POPUP_H
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index ea4ef11bd..4c82fe20c 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -56,8 +56,7 @@ ProgressBar::ProgressBar(const Widget2 *const widget,
     mFillPadding(3),
     mFillImage(false),
     mSmoothProgress(true),
-    mSmoothColorChange(true),
-    mRedraw(true)
+    mSmoothColorChange(true)
 {
     mBackgroundColor = Theme::getProgressColor(backColor >= 0
         ? backColor : 0, mProgress);
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index fef9bf11d..e45bc4abb 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -159,7 +159,6 @@ class ProgressBar final : public Widget,
         bool mFillImage;
         bool mSmoothProgress;
         bool mSmoothColorChange;
-        bool mRedraw;
 };
 
 #endif  // GUI_WIDGETS_PROGRESSBAR_H
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 95a9cd399..b748e30a1 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -131,8 +131,7 @@ ScrollArea::ScrollArea(Widget2 *const widget2,
     mIsVerticalMarkerDragged(false),
     mIsHorizontalMarkerDragged(false),
     mOpaque(true),
-    mHasMouse(false),
-    mRedraw(true)
+    mHasMouse(false)
 {
     setContent(widget);
     addMouseListener(this);
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index d3d71b65a..0d540c399 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -586,7 +586,6 @@ class ScrollArea final : public BasicContainer,
         bool mOpaque;
 
         bool mHasMouse;
-        bool mRedraw;
 };
 
 #endif  // GUI_WIDGETS_SCROLLAREA_H
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 49be84b88..e789c863d 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -42,8 +42,7 @@ ShortcutContainer::ShortcutContainer(Widget2 *const widget) :
     mBoxHeight(1),
     mGridWidth(1),
     mGridHeight(1),
-    mVertexes(new ImageCollection),
-    mRedraw(true)
+    mVertexes(new ImageCollection)
 {
     mAllowLogic = false;
 }
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 81392097b..d4d4ac4bf 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -93,9 +93,6 @@ class ShortcutContainer : public Widget,
 
         void drawBackground(Graphics *g);
 
-        void setRedraw(bool b)
-        { mRedraw = b; }
-
     protected:
         /**
          * Constructor. Initializes the shortcut container.
@@ -121,7 +118,6 @@ class ShortcutContainer : public Widget,
         int mGridWidth;
         int mGridHeight;
         ImageCollection *mVertexes;
-        bool mRedraw;
 };
 
 #endif  // GUI_WIDGETS_SHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 6119fc624..a08d94440 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -103,8 +103,7 @@ Slider::Slider(Widget2 *const widget,
     mOrientation(HORIZONTAL),
     mVertexes(new ImageCollection),
     mMarkerLength(10),
-    mHasMouse(false),
-    mRedraw(true)
+    mHasMouse(false)
 {
     init();
 }
@@ -123,8 +122,7 @@ Slider::Slider(Widget2 *const widget,
     mOrientation(HORIZONTAL),
     mVertexes(new ImageCollection),
     mMarkerLength(10),
-    mHasMouse(false),
-    mRedraw(true)
+    mHasMouse(false)
 {
     init();
 }
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index fe59119f5..3cd43493e 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -351,7 +351,6 @@ class Slider final : public Widget,
         int mMarkerLength;
 
         bool mHasMouse;
-        bool mRedraw;
 };
 
 #endif  // GUI_WIDGETS_SLIDER_H
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index c2a6c0207..e31bc9ef1 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -113,7 +113,6 @@ Tab::Tab(const Widget2 *const widget) :
     mVertexes(new ImageCollection),
     mImage(nullptr),
     mMode(0),
-    mRedraw(true),
     mHasMouse(false)
 {
     init();
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index a0afa6fcd..4a88a5400 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -228,7 +228,6 @@ class Tab : public BasicContainer,
         ImageCollection *mVertexes;
         Image *mImage;
         int mMode;
-        bool mRedraw;
 
     protected:
         bool mHasMouse;
diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp
index c61881673..5a51a2012 100644
--- a/src/gui/widgets/widget.cpp
+++ b/src/gui/widgets/widget.cpp
@@ -108,7 +108,8 @@ Widget::Widget(const Widget2 *const widget) :
     mTabOut(true),
     mEnabled(true),
     mAllowLogic(true),
-    mMouseConsume(true)
+    mMouseConsume(true),
+    mRedraw(true)
 {
     mWidgets.push_back(this);
     mWidgetsSet.insert(this);
diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h
index 86b203666..46245ea2b 100644
--- a/src/gui/widgets/widget.h
+++ b/src/gui/widgets/widget.h
@@ -1018,6 +1018,9 @@ class Widget : public Widget2
         bool isMouseConsume() const A_WARN_UNUSED
         { return mMouseConsume; }
 
+        void setRedraw(const bool b)
+        { mRedraw = b; }
+
     protected:
         /**
           * Distributes an action event to all action listeners
@@ -1230,6 +1233,8 @@ class Widget : public Widget2
 
         bool mMouseConsume;
 
+        bool mRedraw;
+
         /**
           * Holds the global font used by the widget.
           */
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 9e032f75b..7cad9999c 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -109,7 +109,6 @@ Window::Window(const std::string &caption, const bool modal,
     mDefaultY(0),
     mDefaultWidth(0),
     mDefaultHeight(0),
-    mRedraw(true),
     mLastRedraw(true),
     mGrip(nullptr),
     mParent(parent),
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index dfd1f63b7..175cc25f0 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -633,7 +633,6 @@ class Window : public BasicContainer2,
         int mDefaultY;                /**< Default window Y position */
         int mDefaultWidth;            /**< Default window width */
         int mDefaultHeight;           /**< Default window height */
-        bool mRedraw;
         bool mLastRedraw;
 
     private:
-- 
cgit v1.2.3-60-g2f50