From 90b3f702bdc3ad6228f302cc8c9f7d5f272460dc Mon Sep 17 00:00:00 2001
From: Ignacio Etcheverry <ignalfonsore@gmail.com>
Date: Sat, 11 Jun 2016 21:51:00 +0200
Subject: [PATCH] BaseButton: Add identifier for shortcut in tooltip

---
 scene/gui/base_button.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index 2200cac5da2..bc498f47bcd 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;
 }