summaryrefslogtreecommitdiff
path: root/src/gui/popup.h
diff options
context:
space:
mode:
authorIra Rice <shogun@odin.(none)>2009-03-25 09:55:44 -0600
committerIra Rice <shogun@odin.(none)>2009-03-25 09:55:44 -0600
commitf6e7a477681109aea040456e3f4ebd0f65645ecc (patch)
tree258380203c03ede0fdaf8e2c0009a03bb1da8523 /src/gui/popup.h
parent46a368e2f6fd8fcc30949c6676045e2005bd5bfa (diff)
downloadmana-client-f6e7a477681109aea040456e3f4ebd0f65645ecc.tar.gz
mana-client-f6e7a477681109aea040456e3f4ebd0f65645ecc.tar.bz2
mana-client-f6e7a477681109aea040456e3f4ebd0f65645ecc.tar.xz
mana-client-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/popup.h')
-rw-r--r--src/gui/popup.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/gui/popup.h b/src/gui/popup.h
index bfe8d7e9..3e3ff5ad 100644
--- a/src/gui/popup.h
+++ b/src/gui/popup.h
@@ -28,7 +28,6 @@
#include "../graphics.h"
#include "../guichanfwd.h"
-class ConfigListener;
class Skin;
class SkinLoader;
class Window;
@@ -43,8 +42,6 @@ class WindowContainer;
class Popup : public gcn::Container
{
public:
- friend class PopupConfigListener;
-
/**
* Constructor. Initializes the title to the given text and hooks
* itself into the popup container.
@@ -170,21 +167,13 @@ class Popup : public gcn::Container
virtual gcn::Rectangle getChildrenArea();
private:
- void setGuiAlpha();
-
Window *mParent; /**< The parent Window (if there is one) */
std::string mPopupName; /**< Name of the Popup */
- static bool mAlphaChanged; /**< Whether the alpha percent was changed */
int mMinWidth; /**< Minimum Popup width */
int mMinHeight; /**< Minimum Popup height */
int mMaxWidth; /**< Maximum Popup width */
int mMaxHeight; /**< Maximum Popup height */
- unsigned int mPadding; /**< Holds the padding of the window. */
-
- /**
- * The config listener that listens to changes relevant to all Popups.
- */
- static ConfigListener *popupConfigListener;
+ unsigned int mPadding; /**< Holds the padding of the window. */
static int instances; /**< Number of Popup instances */