Merge lp:~gangsterveggies/granite/fix-bug-1214933 into lp:~elementary-pantheon/granite/granite

[Pedro Paredes]

Fixes bug #1214933, of having smart tabs on the DynamicNotebook.

[Danielle Foré (danrabbit)]

This doesn't appear to work as intended, if I understand the bug report correctly. When I close a tab, the next tab's close button is not underneath my cursor.

[Danielle Foré (danrabbit)]

http://videobin.org/+6ts/8b3.html

[Pedro Paredes (gangsterveggies)]

> http://videobin.org/+6ts/8b3.html

I've been investigating it and apparently (as you suggested in the IRC) the problem is when the tab overflow makes the arrows for changing tabs... I'll try to correct it, thanks for the heads up.

[Pedro Paredes (gangsterveggies)]

> > http://videobin.org/+6ts/8b3.html
>
> I've been investigating it and apparently (as you suggested in the IRC) the
> problem is when the tab overflow makes the arrows for changing tabs... I'll
> try to correct it, thanks for the heads up.

The actual problem is when you remove a tab and the arrow disappears. The arrows change the margins of the tabs... I think it would be a good idea to remove the arrows by setting it to not scrollable (since this is a feature from the Gtk.Notebook) and add our own arrows so that we have more control over the thing.

[David Gomes (davidgomes)]

The more independent DynamicNotebook is, the better, if you can do that, it'll be great.

[Pedro Paredes (gangsterveggies)]

> The more independent DynamicNotebook is, the better, if you can do that, it'll
> be great.

I can do it but it should be on a different branch. I think we should merge or discard this one and then after the arrows thing I would fix or redo it.

Unmerged revisions

614. By Pedro Paredes on 2013-08-22

Fixed bug #1214933

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2013-08-19 22:05:17 +0000
+++ lib/Widgets/DynamicNotebook.vala	2013-08-22 18:12:05 +0000
@@ -39,10 +39,10 @@
         }
 
         /**
-	 * Data which will be kept once the tab is deleted, and which will be used by
-	 * the application to restore the data into the restored tab. Let it empty if
-	 * the tab should not be restored.
-	 **/
+     * Data which will be kept once the tab is deleted, and which will be used by
+     * the application to restore the data into the restored tab. Let it empty if
+     * the tab should not be restored.
+     **/
         public string restore_data { get; set; }
 
         internal Gtk.EventBox page_container;
@@ -446,6 +446,10 @@
         private int tab_width = 150;
         private int max_tab_width = 150;
 
+        private uint tab_closing = -1;
+
+        private int smart_tab_time = 2;
+
         public signal void tab_added (Tab tab);
         public signal bool tab_removed (Tab tab);
         Tab? old_tab; //stores a reference for tab_switched
@@ -679,7 +683,7 @@
         }
 
         private void recalc_size () {
-            if (n_tabs == 0)
+            if (n_tabs == 0 || tab_closing != -1)
                 return;
 
             var offset = 130;
@@ -728,10 +732,20 @@
                 restore_button.sensitive = !closed_tabs.empty;
                 restore_tab_m.sensitive = !closed_tabs.empty;
             }
+
+            if (tab_closing != -1) {
+                GLib.Source.remove (tab_closing);
+            }
+
+            tab_closing = Timeout.add_seconds (smart_tab_time, () => {
+                tab_closing = -1;
+                recalc_size ();
+                return false;
+            });
         }
         
-	[Deprecated (since=0.2)]
-	public void remove_tab_force (Tab tab) {
+    [Deprecated (since=0.2)]
+    public void remove_tab_force (Tab tab) {
             var pos = get_tab_position (tab);
             if (pos != -1)
                 notebook.remove_page (pos);