Merge lp:~julien-spautz/granite/1157350 into lp:~elementary-pantheon/granite/granite

[Julien Spautz]

Fix bug #1157350

[David Gomes (davidgomes)]

I'm reviewing this together with lp:~julien-spautz/pantheon-terminal/1157350/+merge/155124, so please nobody merge this.

[lp:~julien-spautz/granite/1157350]

549. By Julien Spautz on 2013-03-24

don't destroy tabs when they are moved

550. By Julien Spautz on 2013-03-24

addad a tab_detached and tab_attached signal, since the Gtk.Noteebook is private, and apps can't otherwise connect to drag events

[Julien Spautz (julien-spautz)]

tab_detached gets emitted _after_ the tab has successfully been dragged to it's destination to be attached to another notebook or to create a new window.

tab_attached gets emitted when a tab has been dropped into the notebook.

This is needed for the terminal fix, but might be useful for other apps, too.

[Cody Garver (codygarver)]

What's the status of this code? Has it been superseded?

review: Needs Information

[Julien Spautz (julien-spautz)]

Since xapantu fixed the bug, I guess it's been superseeded.

[xapantu (xapantu)]

It is the same goal that https://code.launchpad.net/~elementary-apps/granite/dynamicnotebook/+merge/157874 apparently, these two branch should probably be merged into a single branch then.

Unmerged revisions

550. By Julien Spautz on 2013-03-24

addad a tab_detached and tab_attached signal, since the Gtk.Noteebook is private, and apps can't otherwise connect to drag events

549. By Julien Spautz on 2013-03-24

don't destroy tabs when they are moved

548. By Julien Spautz on 2013-03-24

fix bug #1157350 by destroying the container AFTER emitting the tab_moved signal

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2013-03-21 14:49:42 +0000
+++ lib/Widgets/DynamicNotebook.vala	2013-03-24 16:50:29 +0000
@@ -321,7 +321,10 @@
         public signal void tab_switched (Tab? old_tab, Tab new_tab);
         public signal void tab_moved (Tab tab, int new_pos, bool new_window, int x, int y);
         public signal void tab_duplicated (Tab duplicated_tab);
-
+        public signal void tab_detached (Tab tab);
+        public signal void tab_attached (Tab tab);
+        Tab ?dragged;
+        
         private static const string CLOSE_BUTTON_STYLE = """
         * {
             -GtkButton-default-border : 0;
@@ -350,6 +353,19 @@
             this.notebook.scrollable = true;
             this.notebook.show_border = false;
 
+            this.notebook.drag_begin.connect (() => {
+                dragged = current;
+            });
+            
+            this.notebook.drag_end.connect (() => {
+                tab_detached (dragged);
+                dragged = null;
+            });
+            
+            this.notebook.drag_data_received.connect (() => {
+                tab_attached (current);
+            });
+
             this.draw.connect ( (ctx) => {
                 this.get_style_context ().render_activity (ctx, 0, 0, this.get_allocated_width (), 27);
                 return false;
@@ -493,8 +509,6 @@
         unowned Gtk.Notebook on_create_window (Gtk.Widget page, int x, int y) {
             var tab = notebook.get_tab_label (page) as Tab;
             notebook.remove_page (notebook.page_num (tab.page_container));
-            tab.page_container.destroy ();
-
             tab_moved (tab, 0, true, x, y);
             return null;
         }
@@ -614,7 +628,6 @@
 
             tab.new_window.connect (() => {
                 notebook.remove_page (notebook.page_num (tab.page_container));
-                tab.page_container.destroy ();
                 tab_moved (tab, 0, true, 0, 0);
             });