asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #55437 from KoBeWi/show_tooltips_only_when_node_is_not_paused_and_when_it's_paused_don't_show_master_edition

Browse source
This commit is contained in:
Rémi Verschelde 2021-11-29 15:40:54 +01:00 committed by GitHub
commit e4a7ee0da9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/main/viewport.cpp
View file

@ -1707,12 +1707,10 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
if (mm->get_button_mask() == MouseButton::NONE) { if (mm->get_button_mask() == MouseButton::NONE) {
// Nothing pressed. // Nothing pressed.
bool can_tooltip = true;
bool is_tooltip_shown = false; bool is_tooltip_shown = false;
if (gui.tooltip_popup) { 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)); String tooltip = _gui_get_tooltip(over, gui.tooltip_control->get_global_transform().xform_inv(mpos));
if (tooltip.length() == 0) { 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()) { if (gui.tooltip_timer.is_valid()) {
gui.tooltip_timer->release_connections(); gui.tooltip_timer->release_connections();
gui.tooltip_timer = Ref<SceneTreeTimer>(); gui.tooltip_timer = Ref<SceneTreeTimer>();