diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 15:29:46 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 15:29:46 +0100 |
commit | aa6f1c46e78864d9900cdf8afb8bacb8c4ce4651 (patch) | |
tree | 595063263f824a8e1022cea9b951352191c6282e /src/gui | |
parent | 3efa949fca06f9a1cad04ff7da8107096ed55044 (diff) | |
download | mana-aa6f1c46e78864d9900cdf8afb8bacb8c4ce4651.tar.gz mana-aa6f1c46e78864d9900cdf8afb8bacb8c4ce4651.tar.bz2 mana-aa6f1c46e78864d9900cdf8afb8bacb8c4ce4651.tar.xz mana-aa6f1c46e78864d9900cdf8afb8bacb8c4ce4651.zip |
Removed all the static initializations of mAlpha
They happened before the configuration was initialized, so that didn't
make any sense. It never showed up as a problem since the value is
constantly set in the draw methods anyway.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/button.cpp | 2 | ||||
-rw-r--r-- | src/gui/checkbox.cpp | 2 | ||||
-rw-r--r-- | src/gui/listbox.cpp | 2 | ||||
-rw-r--r-- | src/gui/playerbox.cpp | 2 | ||||
-rw-r--r-- | src/gui/progressbar.cpp | 2 | ||||
-rw-r--r-- | src/gui/radiobutton.cpp | 2 | ||||
-rw-r--r-- | src/gui/scrollarea.cpp | 2 | ||||
-rw-r--r-- | src/gui/shoplistbox.cpp | 2 | ||||
-rw-r--r-- | src/gui/shortcutcontainer.cpp | 2 | ||||
-rw-r--r-- | src/gui/slider.cpp | 2 | ||||
-rw-r--r-- | src/gui/table.cpp | 2 | ||||
-rw-r--r-- | src/gui/textfield.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/dropdown.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/resizegrip.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tab.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/textpreview.cpp | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/src/gui/button.cpp b/src/gui/button.cpp index 28b7c0d7..c7070667 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -34,7 +34,7 @@ #include "../utils/dtor.h" int Button::mInstances = 0; -float Button::mAlpha = config.getValue("guialpha", 0.8); +float Button::mAlpha = 1.0; enum{ BUTTON_STANDARD, // 0 diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp index 2623e2c6..c7bc8982 100644 --- a/src/gui/checkbox.cpp +++ b/src/gui/checkbox.cpp @@ -29,7 +29,7 @@ #include "../resources/resourcemanager.h" int CheckBox::instances = 0; -float CheckBox::mAlpha = config.getValue("guialpha", 0.8); +float CheckBox::mAlpha = 1.0; Image *CheckBox::checkBoxNormal; Image *CheckBox::checkBoxChecked; Image *CheckBox::checkBoxDisabled; diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp index 7ba84ee7..dbd8e674 100644 --- a/src/gui/listbox.cpp +++ b/src/gui/listbox.cpp @@ -29,7 +29,7 @@ #include "../configuration.h" -float ListBox::mAlpha = config.getValue("guialpha", 0.8); +float ListBox::mAlpha = 1.0; ListBox::ListBox(gcn::ListModel *listModel): gcn::ListBox(listModel) diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index b7e553dc..58ef4cd7 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -32,7 +32,7 @@ #include "../utils/dtor.h" int PlayerBox::instances = 0; -float PlayerBox::mAlpha = config.getValue("guialpha", 0.8); +float PlayerBox::mAlpha = 1.0; ImageRect PlayerBox::background; PlayerBox::PlayerBox(const Player *player): diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp index 02ddab16..c160c159 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -34,7 +34,7 @@ ImageRect ProgressBar::mBorder; int ProgressBar::mInstances = 0; -float ProgressBar::mAlpha = config.getValue("guialpha", 0.8); +float ProgressBar::mAlpha = 1.0; ProgressBar::ProgressBar(float progress, unsigned int width, unsigned int height, diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp index b05e37e6..4a98e29a 100644 --- a/src/gui/radiobutton.cpp +++ b/src/gui/radiobutton.cpp @@ -28,7 +28,7 @@ #include "../resources/resourcemanager.h" int RadioButton::instances = 0; -float RadioButton::mAlpha = config.getValue("guialpha", 0.8); +float RadioButton::mAlpha = 1.0; Image *RadioButton::radioNormal; Image *RadioButton::radioChecked; Image *RadioButton::radioDisabled; diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index 92bb94b8..a867822e 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -30,7 +30,7 @@ #include "../utils/dtor.h" int ScrollArea::instances = 0; -float ScrollArea::mAlpha = config.getValue("guialpha", 0.8); +float ScrollArea::mAlpha = 1.0; ImageRect ScrollArea::background; ImageRect ScrollArea::vMarker; Image *ScrollArea::buttons[4][2]; diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp index db39e82d..8801c51a 100644 --- a/src/gui/shoplistbox.cpp +++ b/src/gui/shoplistbox.cpp @@ -32,7 +32,7 @@ const int ITEM_ICON_SIZE = 32; -float ShopListBox::mAlpha = config.getValue("guialpha", 0.8); +float ShopListBox::mAlpha = 1.0; ShopListBox::ShopListBox(gcn::ListModel *listModel): ListBox(listModel), diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp index 901095e5..9067e921 100644 --- a/src/gui/shortcutcontainer.cpp +++ b/src/gui/shortcutcontainer.cpp @@ -27,7 +27,7 @@ #include "../utils/stringutils.h" -float ShortcutContainer::mAlpha = config.getValue("guialpha", 0.8); +float ShortcutContainer::mAlpha = 1.0; ShortcutContainer::ShortcutContainer(): mGridWidth(1), diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp index cc381c32..f5b159f1 100644 --- a/src/gui/slider.cpp +++ b/src/gui/slider.cpp @@ -29,7 +29,7 @@ Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip; Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip; -float Slider::mAlpha = config.getValue("guialpha", 0.8); +float Slider::mAlpha = 1.0; int Slider::mInstances = 0; Slider::Slider(double scaleEnd): diff --git a/src/gui/table.cpp b/src/gui/table.cpp index ec5b0480..4dda9246 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -30,7 +30,7 @@ #include "../utils/dtor.h" -float GuiTable::mAlpha = config.getValue("guialpha", 0.8); +float GuiTable::mAlpha = 1.0; class GuiTableActionListener : public gcn::ActionListener { diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp index 42279fc4..c94710b3 100644 --- a/src/gui/textfield.cpp +++ b/src/gui/textfield.cpp @@ -36,7 +36,7 @@ #undef DELETE //Win32 compatibility hack int TextField::instances = 0; -float TextField::mAlpha = config.getValue("guialpha", 0.8); +float TextField::mAlpha = 1.0; ImageRect TextField::skin; TextField::TextField(const std::string &text): diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 21378772..d8c66789 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -38,7 +38,7 @@ int DropDown::instances = 0; Image *DropDown::buttons[2][2]; ImageRect DropDown::skin; -float DropDown::mAlpha = config.getValue("guialpha", 0.8); +float DropDown::mAlpha = 1.0; DropDown::DropDown(gcn::ListModel *listModel, gcn::ScrollArea *scrollArea, gcn::ListBox *listBox, bool opacity): diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index 1bb33e15..8c28c20b 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -31,7 +31,7 @@ Image *ResizeGrip::gripImage = 0; int ResizeGrip::mInstances = 0; -float ResizeGrip::mAlpha = config.getValue("guialpha", 0.8); +float ResizeGrip::mAlpha = 1.0; ResizeGrip::ResizeGrip(const std::string &image) { diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index af31822e..f7161ed9 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -36,7 +36,7 @@ #include <guichan/widgets/label.hpp> int Tab::mInstances = 0; -float Tab::mAlpha = config.getValue("guialpha", 0.8); +float Tab::mAlpha = 1.0; enum { TAB_STANDARD, // 0 diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index d0bba285..0d016b2f 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -30,7 +30,7 @@ #include <typeinfo> -float TextPreview::mAlpha = config.getValue("guialpha", 0.8); +float TextPreview::mAlpha = 1.0; TextPreview::TextPreview(const std::string &text): mText(text) |