Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Show shortcut without events in tooltip if it has name

Browse source
This commit is contained in:
kobewi 2025-01-12 20:12:41 +01:00
parent c4a893e988
commit 0f521b5d76
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/BaseButton.xml
View file

@ -75,7 +75,7 @@
If [code]true[/code], the button will highlight for a short amount of time when its shortcut is activated. If [code]false[/code] and [member toggle_mode] is [code]false[/code], the shortcut will activate without any visual feedback.
</member>
<member name="shortcut_in_tooltip" type="bool" setter="set_shortcut_in_tooltip" getter="is_shortcut_in_tooltip_enabled" default="true">
If [code]true[/code], the button will add information about its shortcut in the tooltip.
If [code]true[/code], the button will add information about its shortcut in the tooltip. This includes the shortcut's events and its [member Resource.resource_name]. If both events and name are empty, the shortcut will not be included.
[b]Note:[/b] This property does nothing when the tooltip control is customized using [method Control._make_custom_tooltip].
</member>
<member name="toggle_mode" type="bool" setter="set_toggle_mode" getter="is_toggle_mode" default="false">

14
scene/gui/base_button.cpp
View file

@ -473,11 +473,21 @@ Control *BaseButton::make_custom_tooltip(const String &p_text) const {
if (control) {
return control;
}
if (!shortcut_in_tooltip || shortcut.is_null() || !shortcut->has_valid_event()) {
if (!shortcut_in_tooltip || shortcut.is_null()) {
return nullptr; // Use the default tooltip label.
}
String text = atr(shortcut->get_name()) + " (" + shortcut->get_as_text() + ")";
bool shortcut_has_events = shortcut->has_valid_event();
if (!shortcut_has_events && shortcut->get_name().is_empty()) {
return nullptr;
}
String text = atr(shortcut->get_name());
if (shortcut_has_events) {
text += " (" + shortcut->get_as_text() + ")";
}
if (!p_text.is_empty() && shortcut->get_name().nocasecmp_to(p_text) != 0) {
text += "\n" + atr(p_text);
}