[epiphany] Keep pinned tabs on the left

[Jan-Michael Brummer <jbrummer src gnome org>]

commit 1375a8e6dd3e655b5dcc8d1f366c61f690c22e47
Author: Jan-Michael Brummer <jan brummer tabos org>
Date:   Mon May 13 21:39:13 2019 +0200

    Keep pinned tabs on the left
    
    Keeps pinned tabs on the left and does not reorder tabs on startup.

 src/ephy-notebook.c | 45 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)
---
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 528fb54a1..8fa0e6cb7 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -467,6 +467,39 @@ show_tabs_changed_cb (GSettings    *settings,
   update_tabs_visibility (nb, FALSE);
 }
 
+static int
+get_last_pinned_tab_pos (EphyNotebook *notebook)
+{
+  int pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook));
+  int found = -1;
+
+  for (int i = 0; i < pages; i++) {
+    GtkWidget *child = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), i);
+
+    if (ephy_notebook_tab_is_pinned (notebook, EPHY_EMBED (child)))
+      found = i;
+  }
+
+  return found;
+}
+
+static void
+page_reordered_cb (GtkNotebook *notebook,
+                   GtkWidget   *child,
+                   guint        page_num,
+                   gpointer     user_data)
+{
+  int last_pinned_tab_pos = get_last_pinned_tab_pos (EPHY_NOTEBOOK (notebook));
+  gboolean is_current_tab_pinned = ephy_notebook_tab_is_pinned (EPHY_NOTEBOOK (notebook), EPHY_EMBED 
(child));
+
+  /* Ensure that pinned tabs will always stay at the beginning of tab bar */
+  if (last_pinned_tab_pos != -1 && page_num <= (guint)last_pinned_tab_pos) {
+    gint new_pos = is_current_tab_pinned ? last_pinned_tab_pos : last_pinned_tab_pos + 1;
+
+    gtk_notebook_reorder_child (notebook, child, new_pos);
+  }
+}
+
 static void
 ephy_notebook_init (EphyNotebook *notebook)
 {
@@ -486,6 +519,8 @@ ephy_notebook_init (EphyNotebook *notebook)
   g_signal_connect_after (notebook, "switch-page",
                           G_CALLBACK (ephy_notebook_switch_page_cb),
                           NULL);
+  g_signal_connect (notebook, "page-reordered",
+                    G_CALLBACK (page_reordered_cb), NULL);
 
   /* Set up drag-and-drop target */
   g_signal_connect (notebook, "drag-data-received",
@@ -936,19 +971,19 @@ ephy_notebook_tab_set_pinned (EphyNotebook *notebook,
   GtkWidget *tab_label;
   gboolean expanded;
 
+  gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), embed, !is_pinned);
+  tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (notebook), embed);
+  ephy_tab_label_set_pinned (tab_label, is_pinned);
+
   if (is_pinned) {
     gtk_notebook_reorder_child (GTK_NOTEBOOK (notebook), embed, 0);
     expanded = FALSE;
   } else {
     expanded = g_settings_get_boolean (EPHY_SETTINGS_UI, EPHY_PREFS_UI_EXPAND_TABS_BAR);
+    gtk_notebook_reorder_child (GTK_NOTEBOOK (notebook), embed, -1);
   }
 
   gtk_container_child_set (GTK_CONTAINER (notebook), embed, "tab-expand", expanded, NULL);
-
-  gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), embed, !is_pinned);
-
-  tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (notebook), embed);
-  ephy_tab_label_set_pinned (tab_label, is_pinned);
 }
 
 gboolean