1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104342 from PhairZ/popup-bug

Browse Source 
Fix blank popup menu on `EditorResourcePicker`
This commit is contained in:
Rémi Verschelde 2025-03-21 13:03:49 +01:00
commit dfeb729e08
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/editor_resource_picker.cpp
View File

@ -183,6 +183,12 @@ void EditorResourcePicker::_resource_saved(Object *p_resource) {
}
void EditorResourcePicker::_update_menu() {
if (edit_menu && edit_menu->is_visible()) {
edit_button->set_pressed(false);
edit_menu->hide();
return;
}
_update_menu_items();
Rect2 gt = edit_button->get_screen_rect();
@ -549,6 +555,12 @@ void EditorResourcePicker::_button_input(const Ref<InputEvent> &p_event) {
// a valid resource or the Picker is editable, as
// there will otherwise be nothing to display.
if (edited_resource.is_valid() || is_editable()) {
if (edit_menu && edit_menu->is_visible()) {
edit_button->set_pressed(false);
edit_menu->hide();
return;
}
_update_menu_items();
Vector2 pos = get_screen_position() + mb->get_position();