From 22d87f20faffbbf5b452bc0a35cfd80aebd0f628 Mon Sep 17 00:00:00 2001
From: poke1024
Date: Thu, 21 Dec 2017 20:17:30 +0100
Subject: Consistent display of shortcut names in tooltips

---
 scene/gui/base_button.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scene')

diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index 148277f2d..a67fe2aee 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -450,11 +450,11 @@ String BaseButton::get_tooltip(const Point2 &p_pos) const {
 
 	String tooltip = Control::get_tooltip(p_pos);
 	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() + ")";
+		String text = shortcut->get_name() + " (" + shortcut->get_as_text() + ")";
+		if (shortcut->get_name().nocasecmp_to(tooltip) != 0) {
+			text += "\n" + tooltip;
 		}
+		tooltip = text;
 	}
 	return tooltip;
 }
-- 
cgit v1.2.3-70-g09d2