From 1494f7407f188ec9d1699e821b66b72d418d338e Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Fri, 23 Feb 2024 19:46:03 -0500 Subject: [PATCH] summary-section: Grab focus on summary entry when opening dialog Due to an unintentional behavior change from AdwWindow to AdwDialog, the entry row must be focused after the dialog is displayed. --- src/gui/event-editor/gcal-summary-section.c | 2 ++ src/gui/gcal-window.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/event-editor/gcal-summary-section.c b/src/gui/event-editor/gcal-summary-section.c index 65617c56..f9cd7b2a 100644 --- a/src/gui/event-editor/gcal-summary-section.c +++ b/src/gui/event-editor/gcal-summary-section.c @@ -81,6 +81,8 @@ gcal_reminders_section_set_event (GcalEventEditorSection *section, gtk_editable_set_text (GTK_EDITABLE (self->location_entry), gcal_event_get_location (event)); + adw_entry_row_grab_focus_without_selecting (self->summary_entry); + GCAL_EXIT; } diff --git a/src/gui/gcal-window.c b/src/gui/gcal-window.c index 1919621b..594494ce 100644 --- a/src/gui/gcal-window.c +++ b/src/gui/gcal-window.c @@ -416,8 +416,8 @@ on_window_new_event_cb (GSimpleAction *action, default_calendar = gcal_manager_get_default_calendar (manager); event = gcal_event_new (default_calendar, comp, NULL); - gcal_event_editor_dialog_set_event (self->event_editor, event, TRUE); adw_dialog_present (ADW_DIALOG (self->event_editor), GTK_WIDGET (self)); + gcal_event_editor_dialog_set_event (self->event_editor, event, TRUE); } static void @@ -622,8 +622,8 @@ edit_event (GcalQuickAddPopover *popover, GcalEvent *event, GcalWindow *self) { - gcal_event_editor_dialog_set_event (self->event_editor, event, TRUE); adw_dialog_present (ADW_DIALOG (self->event_editor), GTK_WIDGET (self)); + gcal_event_editor_dialog_set_event (self->event_editor, event, TRUE); } static void @@ -645,8 +645,8 @@ create_event_detailed_cb (GcalView *view, default_calendar = gcal_manager_get_default_calendar (manager); event = gcal_event_new (default_calendar, comp, NULL); - gcal_event_editor_dialog_set_event (self->event_editor, event, TRUE); adw_dialog_present (ADW_DIALOG (self->event_editor), GTK_WIDGET (self)); + gcal_event_editor_dialog_set_event (self->event_editor, event, TRUE); g_clear_object (&comp); } @@ -663,8 +663,8 @@ event_preview_cb (GcalEventWidget *event_widget, { case GCAL_EVENT_PREVIEW_ACTION_EDIT: event = gcal_event_widget_get_event (event_widget); - gcal_event_editor_dialog_set_event (self->event_editor, event, FALSE); adw_dialog_present (ADW_DIALOG (self->event_editor), GTK_WIDGET (self)); + gcal_event_editor_dialog_set_event (self->event_editor, event, FALSE); break; case GCAL_EVENT_PREVIEW_ACTION_NONE: