From 78cdbb6eabbc5fc5c59b5df57807f7ef58ea946c Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Sat, 19 Oct 2024 11:30:33 +0200
Subject: [PATCH 1/3] benchmark-dialog: Port to AdwDialog

---
 src/disks/gdu-benchmark-dialog.c     | 21 +++++++++------------
 src/disks/gdu-benchmark-dialog.h     |  2 +-
 src/disks/ui/gdu-benchmark-dialog.ui |  5 ++---
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/disks/gdu-benchmark-dialog.c b/src/disks/gdu-benchmark-dialog.c
index b53906ec..c6003c07 100644
--- a/src/disks/gdu-benchmark-dialog.c
+++ b/src/disks/gdu-benchmark-dialog.c
@@ -29,7 +29,7 @@ typedef struct
 
 struct _GduBenchmarkDialog
 {
-  AdwWindow      parent_instance;
+  AdwDialog      parent_instance;
 
   GCancellable  *cancellable;
 
@@ -67,16 +67,18 @@ struct _GduBenchmarkDialog
   UDisksClient  *client;
   UDisksObject  *object;
   UDisksBlock   *block;
+
+  GtkWindow     *parent_window;
 };
 
-G_DEFINE_TYPE (GduBenchmarkDialog, gdu_benchmark_dialog, ADW_TYPE_WINDOW)
+G_DEFINE_TYPE (GduBenchmarkDialog, gdu_benchmark_dialog, ADW_TYPE_DIALOG)
 
 G_LOCK_DEFINE (bm_lock);
 
 static gpointer
 gdu_benchmark_dialog_get_window (GduBenchmarkDialog *self)
 {
-  return gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_WINDOW);
+  return self->parent_window;
 }
 
 static void
@@ -579,7 +581,7 @@ benchmark_thread (gpointer user_data)
   sample_size_mib = g_settings_get_int (self->settings, "sample-size-mib");
 
   inhibit_cookie = gtk_application_inhibit ((gpointer)g_application_get_default (),
-                                            GTK_WINDOW (self),
+                                            self->parent_window,
                                             GTK_APPLICATION_INHIBIT_SUSPEND |
                                             GTK_APPLICATION_INHIBIT_LOGOUT,
                                             /* Translators: Reason why suspend/logout is being inhibited */
@@ -767,10 +769,6 @@ gdu_benchmark_dialog_class_init (GduBenchmarkDialogClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, set_sample_size_unit_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_start_clicked_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_cancel_clicked_cb);
-
-  gtk_widget_class_add_binding_action (widget_class,
-                                       GDK_KEY_Escape, 0, "window.close",
-                                       NULL);
 }
 
 void
@@ -799,10 +797,9 @@ gdu_benchmark_dialog_show (GtkWindow    *parent_window,
 {
   GduBenchmarkDialog *self;
 
-  self = g_object_new (GDU_TYPE_BENCHMARK_DIALOG,
-                       "transient-for", parent_window,
-                       NULL);
+  self = g_object_new (GDU_TYPE_BENCHMARK_DIALOG, NULL);
   self->object = g_object_ref (object);
+  self->parent_window = g_object_ref (parent_window);
   self->block = udisks_object_peek_block (self->object);
   self->client = client;
 
@@ -824,5 +821,5 @@ gdu_benchmark_dialog_show (GtkWindow    *parent_window,
       adw_switch_row_set_active (ADW_SWITCH_ROW (self->write_bench_switch), FALSE);
     }
 
-  gtk_window_present (GTK_WINDOW (self));
+  adw_dialog_present (ADW_DIALOG (self), GTK_WIDGET (parent_window));
 }
diff --git a/src/disks/gdu-benchmark-dialog.h b/src/disks/gdu-benchmark-dialog.h
index 69e07ff1..b8b3df00 100644
--- a/src/disks/gdu-benchmark-dialog.h
+++ b/src/disks/gdu-benchmark-dialog.h
@@ -14,7 +14,7 @@
 G_BEGIN_DECLS
 
 #define GDU_TYPE_BENCHMARK_DIALOG (gdu_benchmark_dialog_get_type ())
-G_DECLARE_FINAL_TYPE (GduBenchmarkDialog, gdu_benchmark_dialog, GDU, BENCHMARK_DIALOG, AdwWindow)
+G_DECLARE_FINAL_TYPE (GduBenchmarkDialog, gdu_benchmark_dialog, GDU, BENCHMARK_DIALOG, AdwDialog)
 
 void   gdu_benchmark_dialog_show (GtkWindow    *window,
                                   UDisksObject *object,
diff --git a/src/disks/ui/gdu-benchmark-dialog.ui b/src/disks/ui/gdu-benchmark-dialog.ui
index 2d84b3f8..1483b974 100644
--- a/src/disks/ui/gdu-benchmark-dialog.ui
+++ b/src/disks/ui/gdu-benchmark-dialog.ui
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GduBenchmarkDialog" parent="AdwWindow">
+  <template class="GduBenchmarkDialog" parent="AdwDialog">
     <property name="title" translatable="yes">Benchmark</property>
-    <property name="modal">true</property>
-    <property name="content">
+    <property name="child">
       <object class="AdwToolbarView">
         <child type="top">
           <object class="AdwHeaderBar">
-- 
GitLab


From 066eb2c16bb108db88b49f38a116a65f5d7f299b Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Sat, 19 Oct 2024 11:55:27 +0200
Subject: [PATCH 2/3] benchmark-dialog: Make results page adaptive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The resulting dialog becomes fully adaptive once `width-request=600` is
removed from the DrawingArea.

 - sample_size_row was already used for a spin row so we use
 sample_size_action_row
 - The UI files used to use the translatable string "—", but this was
 overwrited in code by a hardcoded "-" so the later is prefered in the
 UI file.
---
 src/disks/gdu-benchmark-dialog.c     |  32 +++---
 src/disks/ui/gdu-benchmark-dialog.ui | 143 ++++++++-------------------
 2 files changed, 55 insertions(+), 120 deletions(-)

diff --git a/src/disks/gdu-benchmark-dialog.c b/src/disks/gdu-benchmark-dialog.c
index c6003c07..29ef1395 100644
--- a/src/disks/gdu-benchmark-dialog.c
+++ b/src/disks/gdu-benchmark-dialog.c
@@ -47,10 +47,10 @@ struct _GduBenchmarkDialog
 
   /* Results Page */
   GtkWidget     *drawing_area;
-  GtkWidget     *sample_size_label;
-  GtkWidget     *read_rate_label;
-  GtkWidget     *write_rate_label;
-  GtkWidget     *access_time_label;
+  GtkWidget     *sample_size_action_row;
+  GtkWidget     *read_rate_row;
+  GtkWidget     *write_rate_row;
+  GtkWidget     *access_time_row;
 
   /* must hold bm_lock when reading/writing these */
   GError        *bm_error;
@@ -217,10 +217,10 @@ update_dialog (GduBenchmarkDialog *self)
 
       
       s = g_strdup ("–");
-      gtk_label_set_text (GTK_LABEL (self->sample_size_label), s);
-      gtk_label_set_text (GTK_LABEL (self->read_rate_label), s);
-      gtk_label_set_text (GTK_LABEL (self->write_rate_label), s);
-      gtk_label_set_text (GTK_LABEL (self->access_time_label), s);
+      adw_action_row_set_subtitle (ADW_ACTION_ROW (self->sample_size_action_row), s);
+      adw_action_row_set_subtitle (ADW_ACTION_ROW (self->read_rate_row), s);
+      adw_action_row_set_subtitle (ADW_ACTION_ROW (self->write_rate_row), s);
+      adw_action_row_set_subtitle (ADW_ACTION_ROW (self->access_time_row), s);
       return;
     }
 
@@ -233,21 +233,21 @@ update_dialog (GduBenchmarkDialog *self)
   if (read_stats.avg != 0.0)
     {
       s = format_stats (read_stats.avg, self->read_samples->len, FALSE);
-      gtk_label_set_markup (GTK_LABEL (self->read_rate_label), s);
+      adw_action_row_set_subtitle (ADW_ACTION_ROW (self->read_rate_row), s);
       g_free (s);
     }
 
   if (write_stats.avg != 0.0)
     {
       s = format_stats (write_stats.avg, self->write_samples->len, FALSE);
-      gtk_label_set_markup (GTK_LABEL (self->write_rate_label), s);
+      adw_action_row_set_subtitle (ADW_ACTION_ROW (self->write_rate_row), s);
       g_free (s);
     }
 
   if (atime_stats.avg != 0.0)
     {
       s = format_stats (atime_stats.avg, self->atime_samples->len, TRUE);
-      gtk_label_set_markup (GTK_LABEL (self->access_time_label), s);
+      adw_action_row_set_subtitle (ADW_ACTION_ROW (self->access_time_row), s);
       g_free (s);
     }
 
@@ -657,7 +657,7 @@ start_benchmark (GduBenchmarkDialog *self)
   if (sample_size != 0)
   {
     s = g_format_size_full (sample_size, G_FORMAT_SIZE_IEC_UNITS | G_FORMAT_SIZE_LONG_FORMAT);
-    gtk_label_set_markup (GTK_LABEL (self->sample_size_label), s);
+    adw_action_row_set_subtitle (ADW_ACTION_ROW (self->sample_size_action_row), s);
   }
 
   g_thread_new ("benchmark-thread",
@@ -761,10 +761,10 @@ gdu_benchmark_dialog_class_init (GduBenchmarkDialogClass *klass)
   gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, write_bench_switch);
 
   gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, drawing_area);
-  gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, sample_size_label);
-  gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, read_rate_label);
-  gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, write_rate_label);
-  gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, access_time_label);
+  gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, sample_size_action_row);
+  gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, read_rate_row);
+  gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, write_rate_row);
+  gtk_widget_class_bind_template_child (widget_class, GduBenchmarkDialog, access_time_row);
 
   gtk_widget_class_bind_template_callback (widget_class, set_sample_size_unit_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_start_clicked_cb);
diff --git a/src/disks/ui/gdu-benchmark-dialog.ui b/src/disks/ui/gdu-benchmark-dialog.ui
index 1483b974..099565d5 100644
--- a/src/disks/ui/gdu-benchmark-dialog.ui
+++ b/src/disks/ui/gdu-benchmark-dialog.ui
@@ -127,116 +127,51 @@
               <object class="GtkStackPage">
                 <property name="name">results</property>
                 <property name="child">
-                  <object class="AdwClamp">
+                  <object class="AdwPreferencesPage">
                     <child>
-                      <object class="GtkBox">
-                        <property name="orientation">1</property>
+                      <object class="GtkDrawingArea" id="drawing_area">
+                        <property name="width-request">600</property>
+                        <property name="height-request">300</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwPreferencesGroup">
                         <child>
-                          <object class="GtkDrawingArea" id="drawing_area">
-                            <property name="width-request">600</property>
-                            <property name="height-request">300</property>
+                          <object class="AdwActionRow" id="sample_size_action_row">
+                            <property name="title" translatable="yes">Sample Size</property>
+                            <property name="subtitle">-</property>
+                            <style>
+                              <class name="property" />
+                            </style>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkBox">
-                            <property name="margin-start">12</property>
-                            <property name="margin-end">12</property>
-                            <property name="margin-top">12</property>
-                            <property name="margin-bottom">12</property>
-                            <child>
-                              <object class="GtkGrid">
-                                <property name="hexpand">true</property>
-                                <property name="column-homogeneous">true</property>
-                                <property name="row-spacing">6</property>
-                                <property name="column-spacing">12</property>
-                                <property name="margin-start">12</property>
-                                <property name="margin-end">12</property>
-                                <property name="margin-top">12</property>
-                                <property name="margin-bottom">12</property>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Sample Size</property>
-                                    <property name="halign">1</property>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">0</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="sample_size_label">
-                                    <property name="label" translatable="yes">—</property>
-                                    <property name="halign">2</property>
-                                    <layout>
-                                      <property name="column">1</property>
-                                      <property name="row">0</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Average Read Rate</property>
-                                    <property name="halign">1</property>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="read_rate_label">
-                                    <property name="label" translatable="yes">—</property>
-                                    <property name="halign">2</property>
-                                    <layout>
-                                      <property name="column">1</property>
-                                      <property name="row">1</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Average Write Rate</property>
-                                    <property name="halign">1</property>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">2</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="write_rate_label">
-                                    <property name="label" translatable="yes">—</property>
-                                    <property name="halign">2</property>
-                                    <layout>
-                                      <property name="column">1</property>
-                                      <property name="row">2</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Average Access Time</property>
-                                    <property name="halign">1</property>
-                                    <layout>
-                                      <property name="column">0</property>
-                                      <property name="row">3</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="access_time_label">
-                                    <property name="label" translatable="yes">—</property>
-                                    <property name="halign">2</property>
-                                    <layout>
-                                      <property name="column">1</property>
-                                      <property name="row">3</property>
-                                    </layout>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
+                          <object class="AdwActionRow" id="read_rate_row">
+                            <property name="title" translatable="yes">Average Read Rate</property>
+                            <property name="subtitle">-</property>
+                            <property name="use-markup">True</property>
+                            <style>
+                              <class name="property" />
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwActionRow" id="write_rate_row">
+                            <property name="title" translatable="yes">Average Write Rate</property>
+                            <property name="subtitle">-</property>
+                            <property name="use-markup">True</property>
+                            <style>
+                              <class name="property" />
+                            </style>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwActionRow" id="access_time_row">
+                            <property name="title" translatable="yes">Average Access Time</property>
+                            <property name="subtitle">-</property>
+                            <property name="use-markup">True</property>
                             <style>
-                              <class name="card"/>
+                              <class name="property" />
                             </style>
                           </object>
                         </child>
-- 
GitLab


From 6338c88aa549f73454b6cab2f62c77edf2e0d42f Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Sat, 19 Oct 2024 12:05:03 +0200
Subject: [PATCH 3/3] benchmark-dialog: Move GTK 4 TODO

Moves the TODO to the right place, since we don't draw anything yet,
there is no need to specify a width or height.
---
 src/disks/gdu-benchmark-dialog.c     | 35 +++++++---------------------
 src/disks/ui/gdu-benchmark-dialog.ui |  5 +---
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/disks/gdu-benchmark-dialog.c b/src/disks/gdu-benchmark-dialog.c
index 29ef1395..2895508c 100644
--- a/src/disks/gdu-benchmark-dialog.c
+++ b/src/disks/gdu-benchmark-dialog.c
@@ -146,29 +146,15 @@ get_max_min_avg (GArray *array)
   return ret;
 }
 
-static gdouble
-measure_width (cairo_t     *cr,
-               const gchar *s)
-{
-  cairo_text_extents_t te;
-  cairo_text_extents (cr, s, &te);
-  return te.width;
-}
-
-static gdouble
-measure_height (cairo_t     *cr,
-                const gchar *s)
-{
-  cairo_text_extents_t te;
-  cairo_text_extents (cr, s, &te);
-  return te.height;
-}
-
 static gboolean
-on_drawing_area_draw (GtkWidget      *widget,
+on_drawing_area_draw (GtkDrawingArea *widget,
                       cairo_t        *cr,
+                      int             width,
+                      int             height,
                       gpointer        user_data)
-{}
+{
+  /* gtk4 todo fill this function */
+}
 
 /* ---------------------------------------------------------------------------------------------------- */
 
@@ -194,7 +180,6 @@ format_stats (gdouble stat,
 static void
 update_dialog (GduBenchmarkDialog *self)
 {
-  GdkSurface *window = NULL;
   g_autoptr(GError) error = NULL;
   BMStats read_stats;
   BMStats write_stats;
@@ -251,11 +236,7 @@ update_dialog (GduBenchmarkDialog *self)
       g_free (s);
     }
 
-  /* gtk4 todo
-  window = gtk_widget_get_window (self->drawing_area);
-  if (window != NULL)
-    gdk_window_invalidate_rect (window, NULL, TRUE);
-  */
+  gtk_widget_queue_draw (self->drawing_area);
 }
 
 /* called on main / UI thread */
@@ -788,6 +769,8 @@ gdu_benchmark_dialog_init (GduBenchmarkDialog *self)
   self->atime_samples = g_array_new (FALSE, /* zero-terminated */
                                               FALSE, /* clear */
                                               sizeof (BMSample));
+
+  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (self->drawing_area), (GtkDrawingAreaDrawFunc) on_drawing_area_draw, NULL, NULL);
 }
 
 void
diff --git a/src/disks/ui/gdu-benchmark-dialog.ui b/src/disks/ui/gdu-benchmark-dialog.ui
index 099565d5..c2ec3bde 100644
--- a/src/disks/ui/gdu-benchmark-dialog.ui
+++ b/src/disks/ui/gdu-benchmark-dialog.ui
@@ -129,10 +129,7 @@
                 <property name="child">
                   <object class="AdwPreferencesPage">
                     <child>
-                      <object class="GtkDrawingArea" id="drawing_area">
-                        <property name="width-request">600</property>
-                        <property name="height-request">300</property>
-                      </object>
+                      <object class="GtkDrawingArea" id="drawing_area" />
                     </child>
                     <child>
                       <object class="AdwPreferencesGroup">
-- 
GitLab