Merge lp:~limeth/midori/midori-bug-768569 into lp:midori

[Limeth]

- Change "Show Tab Icon Only" to "Pin Tab" and "Show Tab Label" to "Unpin Tab";
- Move pinned tab after pinned tabs on the left, move unpinned tab out of pinned tabs to the right

Fixes: https://bugs.launchpad.net/midori/+bug/768569

[Cris Dywan (kalikiana)]

The behavior is erratic, there's a 50/50 chance the tab size is reduced and it's at the left side. Also pinned tabs are never restored upon restart.

I think all updates should happen in tab_minimized because that also applies on restart, rather than in the UI-specific callback. But from a quick check that's not resolving the fundamental problem here.

review: Needs Fixing

[Cris Dywan (kalikiana)]

Incidentally I always imagined if we did this sort of thing it would be the most natural to put the pinned tabs in the left-side hbox, and not keep them as regular tabs. If you haven't considered that, it might make thinks easier.

Unmerged revisions

7044. By Limeth on 2015-09-28

Move pinned tab after pinned tabs on the left, move unpinned tab out of pinned tabs to the right

7043. By Limeth on 2015-09-28

Change "Show Tab Icon Only" to "Pin Tab" and "Show Tab Label" to "Unpin Tab"

=== modified file 'data/faq.html'
--- data/faq.html	2015-08-30 10:19:52 +0000
+++ data/faq.html	2015-10-03 09:17:15 +0000
@@ -471,7 +471,7 @@
 <div class="level4">
 
 <p>
-Right-click the tab label, and click &#039;Minimize&#039; or &#039;Show Tab Icon Only&#039; (Midori 0.3.5 or older).
+Right-click the tab label, and click &#039;Minimize&#039; or &#039;Pin Tab&#039; (Midori 0.3.5 or older).
 </p>
 
 </div>

=== modified file 'midori/midori-notebook.vala'
--- midori/midori-notebook.vala	2014-03-30 14:00:38 +0000
+++ midori/midori-notebook.vala	2015-10-03 09:17:15 +0000
@@ -359,6 +359,48 @@
             resize (size.width);
         }
 
+        /**
+         * Returns the amount of pinned tabs on the left side of the notebook.
+         * If break_at is specified, stops counting once it reaches break_at.
+         */
+        int get_number_of_pinned_tabs_on_the_left (Midori.Tab? break_at = null)
+        {
+            var minimized_tabs_on_the_left = 0;
+
+            foreach (var child in notebook.get_children ()) {
+                if ((break_at != null && child == break_at) || !(child is Midori.Tab) || !((Midori.Tab) child).minimized)
+                    break;
+
+                minimized_tabs_on_the_left++;
+            }
+
+            return minimized_tabs_on_the_left;
+        }
+
+        /**
+         * Pins/unpins selected tab
+         */
+        bool toggle_tab_minimized (Midori.Tab tab)
+        {
+            var tab_index = notebook.page_num (tab);
+
+            if (tab.minimized) {
+                var minimized_tabs_on_the_left = get_number_of_pinned_tabs_on_the_left ();
+
+                if (tab_index < minimized_tabs_on_the_left) {
+                    notebook.reorder_child (tab, minimized_tabs_on_the_left - 1);
+                }
+            } else {
+                var minimized_tabs_on_the_left = get_number_of_pinned_tabs_on_the_left (tab);
+
+                if (tab_index > minimized_tabs_on_the_left) {
+                    notebook.reorder_child (tab, minimized_tabs_on_the_left);
+                }
+            }
+
+            return tab.minimized = !tab.minimized;
+        }
+
         /* Since: 0.5.8 */
         public ContextAction get_tab_context_action (Midori.Tab tab) {
             var menu = new Midori.ContextAction ("TabContextMenu", null, null, null);
@@ -368,10 +410,8 @@
                 tab_detached (tab, 128, 128);
             });
             menu.add (action_window);
-            var action_minimize = new Midori.ContextAction ("TabMinimize", tab.minimized ? _("Show Tab _Label") : _("Show Tab _Icon Only"), null, null);
-            action_minimize.activate.connect (()=>{
-                tab.minimized = !tab.minimized;
-            });
+            var action_minimize = new Midori.ContextAction ("TabMinimize", tab.minimized ? _("Un_pin Tab") : _("_Pin Tab"), null, null);
+            action_minimize.activate.connect (() => toggle_tab_minimized (tab));
             menu.add (action_minimize);
             var action_right = new Midori.ContextAction ("TabCloseRight", ngettext ("Close Tab to the R_ight", "Close Tabs to the R_ight", count - 1), null, null);
             action_right.sensitive = count > 1;