fix: GroupChatRoster: Make scrollbar the right-most widget

Fixes #11290

2 files changed, 43 insertions, 38 deletions

diff --git a/gajim/data/gui/groupchat_roster.ui b/gajim/data/gui/groupchat_roster.ui
index 1afe1520b..579ce8506 100644
--- a/gajim/data/gui/groupchat_roster.ui
+++ b/gajim/data/gui/groupchat_roster.ui
@@ -67,6 +67,8 @@
           <object class="GtkSearchEntry" id="search_entry">
             <property name="visible">True</property>
             <property name="can-focus">True</property>
+            <property name="margin-start">18</property>
+            <property name="margin-end">18</property>
             <property name="primary-icon-name">edit-find-symbolic</property>
             <property name="primary-icon-activatable">False</property>
             <property name="primary-icon-sensitive">False</property>
@@ -95,53 +97,56 @@
         <property name="can-focus">True</property>
         <property name="hscrollbar-policy">never</property>
         <child>
-          <object class="GtkTreeView" id="roster_treeview">
+          <object class="GtkViewport">
             <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="headers-visible">False</property>
-            <property name="expander-column">expander</property>
-            <property name="enable-search">False</property>
-            <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/>
-            <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/>
-            <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/>
-            <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/>
-            <child internal-child="selection">
-              <object class="GtkTreeSelection"/>
-            </child>
+            <property name="can-focus">False</property>
             <child>
-              <object class="GtkTreeViewColumn" id="contact_column">
-                <property name="sizing">fixed</property>
-                <property name="fixed-width">210</property>
-                <property name="title">avatar</property>
-                <property name="expand">True</property>
+              <object class="GtkTreeView" id="roster_treeview">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="headers-visible">False</property>
+                <property name="expander-column">expander</property>
+                <property name="enable-search">False</property>
+                <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/>
+                <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/>
+                <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/>
+                <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/>
                 <child>
-                  <object class="GtkCellRendererPixbuf" id="avatar_renderer">
-                    <property name="width">40</property>
-                    <property name="ypad">3</property>
-                    <property name="xalign">0</property>
+                  <object class="GtkTreeViewColumn" id="contact_column">
+                    <property name="sizing">fixed</property>
+                    <property name="fixed-width">210</property>
+                    <property name="title">avatar</property>
+                    <property name="expand">True</property>
+                    <child>
+                      <object class="GtkCellRendererPixbuf" id="avatar_renderer">
+                        <property name="width">40</property>
+                        <property name="ypad">3</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <attributes>
+                        <attribute name="visible">2</attribute>
+                        <attribute name="surface">0</attribute>
+                      </attributes>
+                    </child>
+                    <child>
+                      <object class="GtkCellRendererText" id="text_renderer">
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <attributes>
+                        <attribute name="markup">1</attribute>
+                      </attributes>
+                    </child>
                   </object>
-                  <attributes>
-                    <attribute name="visible">2</attribute>
-                    <attribute name="surface">0</attribute>
-                  </attributes>
                 </child>
                 <child>
-                  <object class="GtkCellRendererText" id="text_renderer">
-                    <property name="ellipsize">end</property>
+                  <object class="GtkTreeViewColumn" id="expander">
+                    <property name="visible">False</property>
+                    <property name="sizing">fixed</property>
+                    <property name="title">expander</property>
                   </object>
-                  <attributes>
-                    <attribute name="markup">1</attribute>
-                  </attributes>
                 </child>
               </object>
             </child>
-            <child>
-              <object class="GtkTreeViewColumn" id="expander">
-                <property name="visible">False</property>
-                <property name="sizing">fixed</property>
-                <property name="title">expander</property>
-              </object>
-            </child>
           </object>
         </child>
       </object>
diff --git a/gajim/data/style/gajim.css b/gajim/data/style/gajim.css
index ccabee8f7..10f4bed39 100644
--- a/gajim/data/style/gajim.css
+++ b/gajim/data/style/gajim.css
@@ -989,8 +989,8 @@ popover.combo scrollbar.vertical {
 .start-chat-row:focus { outline: none; }
 
 /* GroupChatRoster */
+.groupchat-roster viewport { padding: 0 18px 0 18px; }
 .groupchat-roster treeview { padding-left: 4px; }
-.groupchat-roster { padding: 0 18px 0 18px; }
 
 /* GroupchatConfig */
 #GroupchatConfig stack { border-bottom: 1px solid; border-color: @borders;}