godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code 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
parent b7632687f4 c0d0531459
commit dfeb729e08
1 changed files with 12 additions and 0 deletions
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() { void EditorResourcePicker::_update_menu() {
if (edit_menu && edit_menu->is_visible()) {
edit_button->set_pressed(false);
edit_menu->hide();
return;
}
_update_menu_items(); _update_menu_items();
Rect2 gt = edit_button->get_screen_rect(); 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 // a valid resource or the Picker is editable, as
// there will otherwise be nothing to display. // there will otherwise be nothing to display.
if (edited_resource.is_valid() || is_editable()) { 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(); _update_menu_items();
Vector2 pos = get_screen_position() + mb->get_position(); Vector2 pos = get_screen_position() + mb->get_position();