diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-17 20:17:33 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-17 20:20:33 +0100 |
| commit | e02c372c50b3d8b498661a05183f460ae6ae395f (patch) | |
| tree | 870758913ad8880b8c86e0168e4334c7722df9ee /src/gui/checkbox.cpp | |
| parent | 26a52e8f74306b6e13e7a2029c19d8c7e1efd23a (diff) | |
| parent | a40c16cac5356d18aa6fc3f4549ece152713cfe2 (diff) | |
| download | mana-e02c372c50b3d8b498661a05183f460ae6ae395f.tar.gz mana-e02c372c50b3d8b498661a05183f460ae6ae395f.tar.bz2 mana-e02c372c50b3d8b498661a05183f460ae6ae395f.tar.xz mana-e02c372c50b3d8b498661a05183f460ae6ae395f.zip | |
Merge branch 'aethyra/master'
Conflicts:
src/gui/npc_text.cpp
src/gui/npc_text.h
src/gui/npcintegerdialog.cpp
src/gui/npclistdialog.cpp
src/gui/npcstringdialog.cpp
src/net/npchandler.cpp
src/npc.cpp
Diffstat (limited to 'src/gui/checkbox.cpp')
| -rw-r--r-- | src/gui/checkbox.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp index 511ed34c..7fa4fa81 100644 --- a/src/gui/checkbox.cpp +++ b/src/gui/checkbox.cpp @@ -45,13 +45,10 @@ CheckBox::CheckBox(const std::string& caption, bool selected): checkBoxChecked = checkBox->getSubImage(9, 0, 9, 10); checkBoxDisabled = checkBox->getSubImage(18, 0, 9, 10); checkBoxDisabledChecked = checkBox->getSubImage(27, 0, 9, 10); - if (config.getValue("opengl", 0)) - { - checkBoxNormal->setAlpha(mAlpha); - checkBoxChecked->setAlpha(mAlpha); - checkBoxDisabled->setAlpha(mAlpha); - checkBoxDisabledChecked->setAlpha(mAlpha); - } + checkBoxNormal->setAlpha(mAlpha); + checkBoxChecked->setAlpha(mAlpha); + checkBoxDisabled->setAlpha(mAlpha); + checkBoxDisabledChecked->setAlpha(mAlpha); checkBox->decRef(); } @@ -87,8 +84,7 @@ void CheckBox::drawBox(gcn::Graphics* graphics) else box = checkBoxDisabled; - if (config.getValue("guialpha", 0.8) != mAlpha && - config.getValue("opengl", 0)) + if (config.getValue("guialpha", 0.8) != mAlpha) { mAlpha = config.getValue("guialpha", 0.8); checkBoxNormal->setAlpha(mAlpha); |