diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
| commit | fa2f3ac593a792c32095c2e885665ec91bb4019d (patch) | |
| tree | f44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/gui/shortcutcontainer.cpp | |
| parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
| parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
| download | mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip | |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/gui/shortcutcontainer.cpp')
| -rw-r--r-- | src/gui/shortcutcontainer.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp index e7675c7d..4472818e 100644 --- a/src/gui/shortcutcontainer.cpp +++ b/src/gui/shortcutcontainer.cpp @@ -21,25 +21,20 @@ #include "shortcutcontainer.h" -#include "../graphics.h" -#include "../inventory.h" -#include "../item.h" -#include "../itemshortcut.h" -#include "../keyboardconfig.h" -#include "../localplayer.h" +#include "../configuration.h" #include "../resources/image.h" -#include "../resources/resourcemanager.h" #include "../utils/tostring.h" +float ShortcutContainer::mAlpha = config.getValue("guialpha", 0.8); + ShortcutContainer::ShortcutContainer(): mGridWidth(1), mGridHeight(1) { } - void ShortcutContainer::widgetResized(const gcn::Event &event) { mGridWidth = getWidth() / mBoxWidth; |