diff options
author | Ira Rice <shogun@odin.(none)> | 2009-03-25 09:55:44 -0600 |
---|---|---|
committer | Ira Rice <shogun@odin.(none)> | 2009-03-25 09:55:44 -0600 |
commit | f6e7a477681109aea040456e3f4ebd0f65645ecc (patch) | |
tree | 258380203c03ede0fdaf8e2c0009a03bb1da8523 /src/gui/window.h | |
parent | 46a368e2f6fd8fcc30949c6676045e2005bd5bfa (diff) | |
download | mana-f6e7a477681109aea040456e3f4ebd0f65645ecc.tar.gz mana-f6e7a477681109aea040456e3f4ebd0f65645ecc.tar.bz2 mana-f6e7a477681109aea040456e3f4ebd0f65645ecc.tar.xz mana-f6e7a477681109aea040456e3f4ebd0f65645ecc.zip |
Moved the responsibility for skin alpha adjustment to the Skin class.
This fixes a break that occured where skins wouldn't update in real time
in the client, due to being passed a reference, rather than getting the
skin itself.
Signed-off-by: Ira Rice <shogun@odin.(none)>
Diffstat (limited to 'src/gui/window.h')
-rw-r--r-- | src/gui/window.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/gui/window.h b/src/gui/window.h index 518e1ec2..b0b67ad8 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -30,7 +30,6 @@ #include "../graphics.h" #include "../guichanfwd.h" -class ConfigListener; class GCContainer; class ContainerPlacer; class Layout; @@ -49,8 +48,6 @@ class WindowContainer; class Window : public gcn::Window, gcn::WidgetListener { public: - friend class WindowConfigListener; - /** * Constructor. Initializes the title to the given text and hooks * itself into the window container. @@ -323,8 +320,6 @@ class Window : public gcn::Window, gcn::WidgetListener */ int getResizeHandles(gcn::MouseEvent &event); - void setGuiAlpha(); - GCContainer *mChrome; /**< Contained container */ ResizeGrip *mGrip; /**< Resize grip */ Window *mParent; /**< The parent window */ @@ -334,7 +329,7 @@ class Window : public gcn::Window, gcn::WidgetListener bool mModal; /**< Window is modal */ bool mCloseButton; /**< Window has a close button */ bool mSticky; /**< Window resists minimization */ - static bool mAlphaChanged; /**< Whether the alpha percent was changed */ + bool mAlphaChanged; /**< Whether the alpha percent was changed */ int mMinWinWidth; /**< Minimum window width */ int mMinWinHeight; /**< Minimum window height */ int mMaxWinWidth; /**< Maximum window width */ @@ -344,11 +339,6 @@ class Window : public gcn::Window, gcn::WidgetListener int mDefaultWidth; /**< Default window width */ int mDefaultHeight; /**< Default window height */ - /** - * The config listener that listens to changes relevant to all windows. - */ - static ConfigListener *windowConfigListener; - static int mouseResize; /**< Active resize handles */ static int instances; /**< Number of Window instances */ |