diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-10-24 18:01:23 -0400 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-10-24 18:01:23 -0400 |
| commit | 3679f5971aa431d37cc2acd5d459ed4b38aad26f (patch) | |
| tree | cee32a21c68b1d737fc0cbe52b2a0ff649016123 /scene/main | |
| parent | a22fcac9dc8ecca406a3267849954a5a5373dd11 (diff) | |
| parent | 1015a481ff43edb1126ab39a147fefda290131e5 (diff) | |
| download | redot-engine-3679f5971aa431d37cc2acd5d459ed4b38aad26f.tar.gz | |
Merge commit godotengine/godot@1015a481ff43edb1126ab39a147fefda290131e5
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/canvas_item.cpp | 2 | ||||
| -rw-r--r-- | scene/main/viewport.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index e0b4c75d72..ee5fb252b4 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -1255,7 +1255,7 @@ void CanvasItem::_bind_methods() { ClassDB::bind_method(D_METHOD("force_update_transform"), &CanvasItem::force_update_transform); - ClassDB::bind_method(D_METHOD("make_canvas_position_local", "screen_point"), &CanvasItem::make_canvas_position_local); + ClassDB::bind_method(D_METHOD("make_canvas_position_local", "viewport_point"), &CanvasItem::make_canvas_position_local); ClassDB::bind_method(D_METHOD("make_input_local", "event"), &CanvasItem::make_input_local); ClassDB::bind_method(D_METHOD("set_visibility_layer", "layer"), &CanvasItem::set_visibility_layer); diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 54508d871e..0612823ac2 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1923,7 +1923,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) { String tooltip = _gui_get_tooltip(over, gui.tooltip_control->get_global_transform_with_canvas().affine_inverse().xform(mpos)); tooltip = tooltip.strip_edges(); - if (tooltip.is_empty() || tooltip != gui.tooltip_text) { + if (tooltip != gui.tooltip_text) { _gui_cancel_tooltip(); } else { is_tooltip_shown = true; |