From 905128cc6903b37e8672c2945076932fbd6918ec Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Thu, 7 Jul 2022 12:12:57 -0400
Subject: [PATCH] event-editor: Use AdwEntryRow

---
 meson.build                                  |  2 +-
 src/gui/event-editor/gcal-summary-section.c  | 24 ----------------
 src/gui/event-editor/gcal-summary-section.ui | 30 ++++++--------------
 3 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/meson.build b/meson.build
index 0e9222be..52f1727a 100644
--- a/meson.build
+++ b/meson.build
@@ -163,7 +163,7 @@ libedataserverui_dep = dependency('libedataserverui4-1.0', version: '>= 3.45.1')
 libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.45.1')
 libecal_dep = dependency('libecal-2.0', version: '>= 3.45.1')
 libsoup_dep = dependency('libsoup-3.0')
-libadwaita_dep = dependency('libadwaita-1', version: '>= 1.0.0')
+libadwaita_dep = dependency('libadwaita-1', version: '>= 1.2.alpha')
 glib_dep = dependency('glib-2.0', version: '>= 2.67.5')
 gtk_dep = dependency('gtk4', version: '>= 4.6.0')
 gio_dep = dependency('gio-2.0', version: '>= 2.58.0')
diff --git a/src/gui/event-editor/gcal-summary-section.c b/src/gui/event-editor/gcal-summary-section.c
index 220669ea..401a8c9b 100644
--- a/src/gui/event-editor/gcal-summary-section.c
+++ b/src/gui/event-editor/gcal-summary-section.c
@@ -51,27 +51,6 @@ enum
   N_PROPS
 };
 
-/*
- * Auxiliary methods
- */
-
-static void
-make_entry_expandable (GtkEditable *entry)
-{
-  GtkWidget *child;
-
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (entry));
-       child;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      if (!GTK_IS_TEXT (child))
-        continue;
-
-      gtk_text_set_propagate_text_width (GTK_TEXT (child), TRUE);
-    }
-}
-
-
 /*
  * GcalEventEditorSection interface
  */
@@ -204,7 +183,4 @@ static void
 gcal_summary_section_init (GcalSummarySection *self)
 {
   gtk_widget_init_template (GTK_WIDGET (self));
-
-  make_entry_expandable (self->location_entry);
-  make_entry_expandable (self->summary_entry);
 }
diff --git a/src/gui/event-editor/gcal-summary-section.ui b/src/gui/event-editor/gcal-summary-section.ui
index 33d7b2bf..b427567d 100644
--- a/src/gui/event-editor/gcal-summary-section.ui
+++ b/src/gui/event-editor/gcal-summary-section.ui
@@ -12,37 +12,23 @@
 
         <!-- Summary -->
         <child>
-          <object class="AdwActionRow">
+          <object class="AdwEntryRow" id="summary_entry">
             <property name="title" translatable="yes">Title</property>
-            <property name="activatable-widget">summary_entry</property>
-
-            <child>
-              <object class="GtkEntry" id="summary_entry">
-                <property name="hexpand">True</property>
-                <property name="halign">end</property>
-                <property name="valign">center</property>
-                <property name="width-chars">20</property>
-                <property name="max-width-chars">30</property>
-              </object>
-            </child>
-
           </object>
         </child>
 
         <!-- Location -->
         <child>
-          <object class="AdwActionRow">
+          <object class="AdwEntryRow" id="location_entry">
             <property name="title" translatable="yes">Location</property>
-            <property name="activatable-widget">location_entry</property>
 
-            <child>
-              <object class="GtkEntry" id="location_entry">
-                <property name="hexpand">True</property>
-                <property name="halign">end</property>
+            <child type="suffix">
+              <object class="GtkButton">
                 <property name="valign">center</property>
-                <property name="width-chars">20</property>
-                <property name="max-width-chars">30</property>
-                <property name="secondary_icon_name">find-location-symbolic</property>
+                <property name="icon-name">find-location-symbolic</property>
+                <style>
+                  <class name="flat"/>
+                </style>
               </object>
             </child>