[libadwaita] action-row: Default the title lines to 0



commit 65ac5258cdcd1c1bfdf2d8f29c9518e16bcca445
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Tue Feb 9 09:56:53 2021 +0100

    action-row: Default the title lines to 0
    
    This makes the title-lines and subtitle-lines properties default to 0,
    which is a saner default as it doesn't remove text.

 src/adw-action-row.c    |  7 ++-----
 src/adw-action-row.ui   |  8 ++++----
 tests/test-action-row.c | 16 ++++++++--------
 3 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/src/adw-action-row.c b/src/adw-action-row.c
index 945aa28..87325c8 100644
--- a/src/adw-action-row.c
+++ b/src/adw-action-row.c
@@ -301,7 +301,7 @@ adw_action_row_class_init (AdwActionRowClass *klass)
                       "Number of title lines",
                       "The desired number of title lines",
                       0, G_MAXINT,
-                      1,
+                      0,
                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
@@ -318,7 +318,7 @@ adw_action_row_class_init (AdwActionRowClass *klass)
                       "Number of subtitle lines",
                       "The desired number of subtitle lines",
                       0, G_MAXINT,
-                      1,
+                      0,
                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   g_object_class_install_properties (object_class, LAST_PROP, props);
@@ -369,9 +369,6 @@ adw_action_row_init (AdwActionRow *self)
 {
   AdwActionRowPrivate *priv = adw_action_row_get_instance_private (self);
 
-  priv->title_lines = 1;
-  priv->subtitle_lines = 1;
-
   gtk_widget_init_template (GTK_WIDGET (self));
 
   g_object_bind_property_full (self, "title", priv->title, "visible", G_BINDING_SYNC_CREATE,
diff --git a/src/adw-action-row.ui b/src/adw-action-row.ui
index b6a7738..5567098 100644
--- a/src/adw-action-row.ui
+++ b/src/adw-action-row.ui
@@ -35,11 +35,11 @@
             </style>
             <child>
               <object class="GtkLabel" id="title">
-                <property name="ellipsize">end</property>
+                <property name="ellipsize">none</property>
                 <property name="halign">start</property>
                 <property name="hexpand">True</property>
                 <property name="label" bind-source="AdwActionRow" bind-property="title" 
bind-flags="sync-create"/>
-                <property name="lines">1</property>
+                <property name="lines">0</property>
                 <property name="wrap">True</property>
                 <property name="wrap-mode">word-char</property>
                 <property name="xalign">0</property>
@@ -51,10 +51,10 @@
             <child>
               <object class="GtkLabel" id="subtitle">
                 <property name="visible">False</property>
-                <property name="ellipsize">end</property>
+                <property name="ellipsize">none</property>
                 <property name="halign">start</property>
                 <property name="hexpand">True</property>
-                <property name="lines">1</property>
+                <property name="lines">0</property>
                 <property name="wrap">True</property>
                 <property name="wrap-mode">word-char</property>
                 <property name="xalign">0</property>
diff --git a/tests/test-action-row.c b/tests/test-action-row.c
index 77b7423..060547b 100644
--- a/tests/test-action-row.c
+++ b/tests/test-action-row.c
@@ -94,16 +94,16 @@ test_adw_action_row_title_lines (void)
   row = g_object_ref_sink (ADW_ACTION_ROW (adw_action_row_new ()));
   g_assert_nonnull (row);
 
-  g_assert_cmpint (adw_action_row_get_title_lines (row), ==, 1);
+  g_assert_cmpint (adw_action_row_get_title_lines (row), ==, 0);
 
   g_test_expect_message (ADW_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "adw_action_row_set_title_lines: assertion 
'title_lines >= 0' failed");
   adw_action_row_set_title_lines (row, -1);
   g_test_assert_expected_messages ();
 
-  g_assert_cmpint (adw_action_row_get_title_lines (row), ==, 1);
-
-  adw_action_row_set_title_lines (row, 0);
   g_assert_cmpint (adw_action_row_get_title_lines (row), ==, 0);
+
+  adw_action_row_set_title_lines (row, 1);
+  g_assert_cmpint (adw_action_row_get_title_lines (row), ==, 1);
 }
 
 
@@ -115,16 +115,16 @@ test_adw_action_row_subtitle_lines (void)
   row = g_object_ref_sink (ADW_ACTION_ROW (adw_action_row_new ()));
   g_assert_nonnull (row);
 
-  g_assert_cmpint (adw_action_row_get_subtitle_lines (row), ==, 1);
+  g_assert_cmpint (adw_action_row_get_subtitle_lines (row), ==, 0);
 
   g_test_expect_message (ADW_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "adw_action_row_set_subtitle_lines: assertion 
'subtitle_lines >= 0' failed");
   adw_action_row_set_subtitle_lines (row, -1);
   g_test_assert_expected_messages ();
 
-  g_assert_cmpint (adw_action_row_get_subtitle_lines (row), ==, 1);
-
-  adw_action_row_set_subtitle_lines (row, 0);
   g_assert_cmpint (adw_action_row_get_subtitle_lines (row), ==, 0);
+
+  adw_action_row_set_subtitle_lines (row, 1);
+  g_assert_cmpint (adw_action_row_get_subtitle_lines (row), ==, 1);
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]