From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Sat, 13 Jul 2019 10:39:21 +0200
Subject: infobar: Move the action area below on the phone

This will help the infobars fit on phone screens.

Because of how GtkInfoBar API works, this cannot really be made adaptive
and will have to use the is-phone setting.
---
 gtk/gtkinfobar.c     | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 gtk/ui/gtkinfobar.ui | 14 +++++---------
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 8eb89ff..c6777c9 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -141,6 +141,7 @@ enum
 
 struct _GtkInfoBarPrivate
 {
+  GtkWidget *grid;
   GtkWidget *content_area;
   GtkWidget *action_area;
   GtkWidget *close_button;
@@ -152,6 +153,7 @@ struct _GtkInfoBarPrivate
   gboolean default_response_sensitive;
 
   GtkGesture *gesture;
+  GSettings *settings;
 };
 
 typedef struct _ResponseData ResponseData;
@@ -412,6 +414,8 @@ gtk_info_bar_finalize (GObject *object)
 
   g_object_unref (info_bar->priv->gesture);
 
+  g_clear_object (&info_bar->priv->settings);
+
   G_OBJECT_CLASS (gtk_info_bar_parent_class)->finalize (object);
 }
 
@@ -595,6 +599,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkinfobar.ui");
   gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, content_area);
   gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, action_area);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInfoBar, grid);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInfoBar, close_button);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInfoBar, revealer);
 
@@ -622,6 +627,46 @@ click_pressed_cb (GtkGestureMultiPress *gesture,
     gtk_info_bar_response (info_bar, priv->default_response);
 }
 
+static void
+update_layout (GtkInfoBar *info_bar)
+{
+  GtkInfoBarPrivate *priv = info_bar->priv;
+
+  if (_gtk_get_is_phone ()) {
+    gtk_container_child_set (GTK_CONTAINER (priv->grid), priv->action_area,
+                             "left-attach", 0,
+                             "top-attach", 1,
+                             "width", 2,
+                             NULL);
+    gtk_container_child_set (GTK_CONTAINER (priv->grid), priv->close_button,
+                             "left-attach", 1,
+                             NULL);
+
+    gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->action_area),
+                                    GTK_ORIENTATION_VERTICAL);
+    gtk_button_box_set_layout (GTK_BUTTON_BOX (priv->action_area),
+                               GTK_BUTTONBOX_EXPAND);
+    gtk_style_context_remove_class (gtk_widget_get_style_context (priv->action_area),
+                                    "linked");
+  } else {
+    gtk_container_child_set (GTK_CONTAINER (priv->grid), priv->action_area,
+                             "left-attach", 1,
+                             "top-attach", 0,
+                             "width", 1,
+                             NULL);
+    gtk_container_child_set (GTK_CONTAINER (priv->grid), priv->close_button,
+                             "left-attach", 2,
+                             NULL);
+
+    gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->action_area),
+                                    GTK_ORIENTATION_HORIZONTAL);
+    gtk_button_box_set_layout (GTK_BUTTON_BOX (priv->action_area),
+                               GTK_BUTTONBOX_END);
+  }
+
+  gtk_box_set_spacing (GTK_BOX (priv->action_area), 6);
+}
+
 static void
 gtk_info_bar_init (GtkInfoBar *info_bar)
 {
@@ -645,6 +690,15 @@ gtk_info_bar_init (GtkInfoBar *info_bar)
   priv->gesture = gtk_gesture_multi_press_new (widget);
   gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->gesture), GDK_BUTTON_PRIMARY);
   g_signal_connect (priv->gesture, "pressed", G_CALLBACK (click_pressed_cb), widget);
+
+  update_layout (info_bar);
+
+  priv->settings = _gtk_get_purism_settings ();
+
+  if (priv->settings)
+    g_signal_connect_object (priv->settings, "changed::is-phone",
+           G_CALLBACK (update_layout), info_bar,
+           G_CONNECT_SWAPPED);
 }
 
 static GtkBuildableIface *parent_buildable_iface;
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index 0b0eaf1..e7a8068 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -9,6 +9,9 @@
         <child>
           <object class="GtkBox" id="content">
             <property name="visible">1</property>
+        <child>
+          <object class="GtkGrid" id="grid">
+            <property name="visible">1</property>
             <child>
               <object class="GtkBox" id="content_area">
                 <property name="visible">1</property>
@@ -16,9 +19,6 @@
                 <property name="spacing">16</property>
                 <property name="hexpand">1</property>
               </object>
-              <packing>
-                <property name="expand">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButtonBox" id="action_area">
@@ -27,9 +27,6 @@
                 <property name="spacing">6</property>
                 <property name="layout-style">end</property>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="close_button">
@@ -47,12 +44,11 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
             </child>
           </object>
         </child>
+          </object>
+        </child>
       </object>
     </child>
   </template>