Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions scene/main/viewport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2155,6 +2155,17 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
over = _gui_find_control(mpos);
}

if (over != gui.mouse_over) {
_drop_mouse_over();

_gui_cancel_tooltip();

if (over) {
_gui_call_notification(over, Control::NOTIFICATION_MOUSE_ENTER);
gui.mouse_over = over;
}
}

if (gui.drag_data.get_type() == Variant::NIL && over && !gui.modal_stack.empty()) {
Control *top = gui.modal_stack.back()->get();

Expand Down Expand Up @@ -2193,17 +2204,6 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
}
}

if (over != gui.mouse_over) {
_drop_mouse_over();

_gui_cancel_tooltip();

if (over) {
_gui_call_notification(over, Control::NOTIFICATION_MOUSE_ENTER);
gui.mouse_over = over;
}
}

Control *drag_preview = _gui_get_drag_preview();
if (drag_preview) {
drag_preview->set_position(mpos);
Expand Down
9 changes: 5 additions & 4 deletions thirdparty/gdx/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,11 @@
- Web: Compiling `Thread`
- Change prefix and suffix

## Removed
## Fixed

- `VisualScript`
- [Resolve performance issues with create dialog](https://github.com/godotengine/godot/pull/39797)
- [Fix incorrect notifications for MOUSE_ENTER/EXIT](https://github.com/godotengine/godot/pull/60346)

## Fixed
## Removed

- [Resolve performance issues with create dialog](https://github.com/godotengine/godot/pull/39797)
- `VisualScript`
Loading