Переглянути джерело

Merge pull request #80364 from Calinou/control-escape-dismiss-tooltips

Dismiss currently visible or upcoming tooltips when pressing Escape
Rémi Verschelde 2 роки тому
батько
коміт
46c9a1427d
1 змінених файлів з 12 додано та 0 видалено
  1. 12 0
      scene/main/viewport.cpp

+ 12 - 0
scene/main/viewport.cpp

@@ -2195,6 +2195,18 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 			return;
 		}
 
+		if (p_event->is_action_pressed("ui_cancel")) {
+			// Cancel tooltip timer or hide tooltip when pressing Escape (this is standard behavior in most applications).
+			_gui_cancel_tooltip();
+			if (gui.tooltip_popup) {
+				// If a tooltip was hidden, prevent other actions associated with `ui_cancel` from occurring.
+				// For instance, this prevents the node from being deselected when pressing Escape
+				// to hide a documentation tooltip in the inspector.
+				set_input_as_handled();
+				return;
+			}
+		}
+
 		if (gui.key_focus && !gui.key_focus->is_visible_in_tree()) {
 			gui.key_focus->release_focus();
 		}