summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-11-29 15:40:54 +0100
committerGitHub <noreply@github.com>2021-11-29 15:40:54 +0100
commite4a7ee0da9f29b4188a7c0f83d8db3e9893f15ef (patch)
tree78c4dbb7ea0206f7687a8eae569e6605fa56f4c6
parent2771bced6bf76ac36ca09685ffe98b5f71a622fd (diff)
parentdc5f6ac4cf8276879b381aaead7c8b42f8bbd091 (diff)
Merge pull request #55437 from KoBeWi/show_tooltips_only_when_node_is_not_paused_and_when_it's_paused_don't_show_master_edition
-rw-r--r--scene/main/viewport.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index f9e96a0784..621d5f765b 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1707,12 +1707,10 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
if (mm->get_button_mask() == MouseButton::NONE) {
// Nothing pressed.
- bool can_tooltip = true;
-
bool is_tooltip_shown = false;
if (gui.tooltip_popup) {
- if (can_tooltip && gui.tooltip_control) {
+ if (gui.tooltip_control) {
String tooltip = _gui_get_tooltip(over, gui.tooltip_control->get_global_transform().xform_inv(mpos));
if (tooltip.length() == 0) {
@@ -1737,7 +1735,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
}
}
- if (can_tooltip && !is_tooltip_shown) {
+ if (!is_tooltip_shown && over->can_process()) {
if (gui.tooltip_timer.is_valid()) {
gui.tooltip_timer->release_connections();
gui.tooltip_timer = Ref<SceneTreeTimer>();