Merge branch 'replace-hardcoded-margins' into 'master'

tooltip & placessidebar: Replace hard-coded margins with theme

See merge request GNOME/gtk!2444

gtk/gtkplacessidebar.c

@@ -394,14 +394,11 @@ list_box_header_func (GtkListBoxRow *row,
   else
     {
       before_section_type = SECTION_INVALID;
-      gtk_widget_set_margin_top (GTK_WIDGET (row), 4);
     }
 
   if (before && before_section_type != row_section_type)
     {
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_widget_set_margin_top (separator, 4);
-      gtk_widget_set_margin_bottom (separator, 4);
       gtk_list_box_row_set_header (row, separator);
     }
 }

gtk/theme/Adwaita/_common.scss

@@ -3392,6 +3392,18 @@ row image.sidebar-icon { opacity: $_placesidebar_icons_opacity; } // dim the sid
 placessidebar, .navigation-sidebar {
   > scrolledwindow.frame { border-style: none; }
 
+  list {
+    padding: 4px 0;
+
+    > row {
+      margin: 1px 0;
+    }
+
+    > separator {
+      margin: 4px 0;
+    }
+  }
+
   row {
     // Needs overriding of the GtkListBoxRow padding
     min-height: 36px;
@@ -3607,10 +3619,14 @@ tooltip {
     color: white;
   }
 
-  padding: 4px;
+  padding: 10px;
   border-radius: 5px;
   box-shadow: none; // otherwise it gets inherited by windowframe.csd
   text-shadow: 0 1px black;
+
+  > box {
+    border-spacing: 6px;
+  }
 }
 
 

gtk/ui/gtksidebarrow.ui

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkSidebarRow" parent="GtkListBoxRow">
-    <property name="margin-top">1</property>
-    <property name="margin-bottom">1</property>
     <property name="focus-on-click">False</property>
     <style>
       <class name="sidebar-row"/>

gtk/ui/gtktooltipwindow.ui

@@ -6,11 +6,6 @@
     </style>
     <child>
       <object class="GtkBox" id="box">
-        <property name="spacing">6</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">6</property>
-        <property name="margin-start">6</property>
-        <property name="margin-end">6</property>
         <child>
           <object class="GtkImage" id="image">
             <property name="icon-name">image-missing</property>