summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-11-12 13:19:14 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-11-12 14:03:46 +0100
commit253c660d8e3341ad2d78658a23e599d5aaa84c00 (patch)
tree0718093a3c4f717278a7a6fdfae7bb983bdf9e3a /src
parentd3f698dbad2bc335765ee931781229cc0f0d123d (diff)
downloadmana-253c660d8e3341ad2d78658a23e599d5aaa84c00.tar.gz
mana-253c660d8e3341ad2d78658a23e599d5aaa84c00.tar.bz2
mana-253c660d8e3341ad2d78658a23e599d5aaa84c00.tar.xz
mana-253c660d8e3341ad2d78658a23e599d5aaa84c00.zip
Removed hiding of button popup when setting the text to empty
The text is never set to an empty string, especially not while the mouse is over the button. The popup will be updated or hidden by mouseMoved anyway. Reviewed-by: Thorbjorn Lindeijer
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/button.cpp7
-rw-r--r--src/gui/widgets/button.h3
2 files changed, 2 insertions, 8 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 2664c655..86c3b80d 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -353,10 +353,3 @@ void Button::mouseExited(gcn::MouseEvent &event)
mTextPopup->setVisible(false);
}
-
-void Button::setButtonPopupText(const std::string& text)
-{
- mPopupText = text;
- if (mPopupText.empty())
- mTextPopup->setVisible(false);
-}
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 94d550e9..371c8f3e 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -79,7 +79,8 @@ class Button : public gcn::Button
*
* @note: An empty text will disable the popup.
*/
- void setButtonPopupText(const std::string& text = std::string());
+ void setButtonPopupText(const std::string& text = std::string())
+ { mPopupText = text; }
void logic();
void mouseMoved(gcn::MouseEvent &event);