From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 3 Feb 2023 09:00:03 +0000 (+0100)
Subject: placessidebar: Make all rows ellipsize
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~8^2~10^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=463f12a3bb42c60e2b86093f443d9d14541c9852;p=gtk4.git

placessidebar: Make all rows ellipsize

Otherwise, we end up with a single long row
pushing the content of all the other rows
off to the left, which is much worse than
ellipsizing.

Fixes: #4710
---

diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c
index 15224b03b8..37cf167c94 100644
--- a/gtk/gtksidebarrow.c
+++ b/gtk/gtksidebarrow.c
@@ -274,11 +274,6 @@ gtk_sidebar_row_set_property (GObject      *object,
 
     case PROP_SECTION_TYPE:
       self->section_type = g_value_get_enum (value);
-      if (self->section_type == GTK_PLACES_SECTION_COMPUTER ||
-          self->section_type == GTK_PLACES_SECTION_OTHER_LOCATIONS)
-        gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_NONE);
-      else
-        gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_END);
       break;
 
     case PROP_PLACE_TYPE:
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index 046a1af08d..3521704472 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -25,6 +25,7 @@
               <object class="GtkLabel" id="label_widget">
                 <property name="hexpand">1</property>
                 <property name="xalign">0</property>
+                <property name="ellipsize">end</property>
                 <style>
                   <class name="sidebar-label"/>
                 </style>