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
2 changes: 1 addition & 1 deletion src/autoload/HandlerGUI.gd
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func _on_menus_or_popups_cleared() -> void:
for control in suppressed_focused_controls:
if is_node_on_top_menu_or_popup(control):
suppressed_focused_controls.erase(control)
if is_instance_valid(control):
if is_instance_valid(control) and not is_node_on_top_menu_or_popup(get_viewport().gui_get_focus_owner()):
control.grab_focus(not control.has_focus(true))
return

Expand Down
2 changes: 2 additions & 0 deletions src/ui_widgets/Dropdown.gd
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,11 @@ func _enter_edit_mode() -> void:
add_child(line_edit)
line_edit.grab_focus()

## To be overridden by scripts that extend Dropdown to change the initial text when editing.
func _get_line_edit_activation_text() -> String:
return _text

## To be overridden by scripts that extend Dropdown to change the placeholder text when editing.
func _get_line_edit_activation_placeholder_text() -> String:
return ""

Expand Down