summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgnacio Etcheverry <ignalfonsore@gmail.com>2016-06-11 21:51:00 +0200
committerIgnacio Etcheverry <ignalfonsore@gmail.com>2016-06-11 21:53:48 +0200
commit90b3f702bdc3ad6228f302cc8c9f7d5f272460dc (patch)
tree792bb863c84600875b3ac6bf50196c242a8532bc
parent26d18b74ac8b5cc3f99fe3aa7d8a2438f9dd52cd (diff)
BaseButton: Add identifier for shortcut in tooltip
-rw-r--r--scene/gui/base_button.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index 2200cac5da..bc498f47bc 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -418,8 +418,13 @@ void BaseButton::_unhandled_input(InputEvent p_event) {
String BaseButton::get_tooltip(const Point2& p_pos) const {
String tooltip=Control::get_tooltip(p_pos);
- if (shortcut.is_valid() && shortcut->is_valid())
- tooltip+=" ("+shortcut->get_as_text()+")";
+ if (shortcut.is_valid() && shortcut->is_valid()) {
+ if (tooltip.find("$sc")!=-1) {
+ tooltip=tooltip.replace_first("$sc","("+shortcut->get_as_text()+")");
+ } else {
+ tooltip+=" ("+shortcut->get_as_text()+")";
+ }
+ }
return tooltip;
}