Merge lp:~junrrein/granite/fixed-tabs into lp:~elementary-pantheon/granite/granite

[Julián Unrrein]

[Dynamic Notebook] Fix the logic of fixed tabs. Set the width of fixed tabs. Don't let fixed tabs be closed or detached.

Fix the logic of fixed tabs. Set the width of fixed tabs. Don't let fixed tabs be closed or detached.

I assumed that tabs shouldn't be able to be closed if they are fixed. They can still be closed with "remove_tab_force".

[lp:~junrrein/granite/fixed-tabs]

602. By Julián Unrrein on 2013-07-01

Revert changes to granite-demo.

[Julián Unrrein (junrrein)]

In short words, the size of fixed tabs should be handled correctly, and they shouldn't be able to be closed now.

[David Gomes (davidgomes)]

Newline 52, putting some curly braces would really help readibility.

[David Gomes (davidgomes)]

I mean, diff line 52*.

[lp:~junrrein/granite/fixed-tabs]

603. By Julián Unrrein on 2013-07-03

Improve the coding style.

[Julián Unrrein (junrrein)]

Hi David. I applied your suggestion but I also changed that particular section a bit.

[lp:~junrrein/granite/fixed-tabs]

604. By Julián Unrrein on 2013-07-03

[DynamicNotebook] Moved a couple of responsibilites from DynamicNotebook to Tab.

605. By Julián Unrrein on 2013-07-14

Set tab properties correctly when moving them to other notebooks.

606. By Julián Unrrein on 2013-07-15

Merge from trunk.

[Julián Unrrein (junrrein)]

It would be nice to disconnect the "on_tab_fixed_set" method when a page is removed from the internal notebook. But I couldn't find a way to retrieve which tab that page belongs to, since it isn't in the notebook anymore. Not having this doesn't seem to cause any bugs.

[lp:~junrrein/granite/fixed-tabs]

607. By Julián Unrrein on 2013-07-15

Remove duplicated operations.

[Julián Unrrein (junrrein)]

When testing this, you may notice that in a fixed tab, the icon is not centered.

Fixing that should wait until https://code.launchpad.net/~junrrein/granite/fix-1196721/+merge/174846 gets reviewed, since that branch changes the way the tab is layouted.

[David Gomes (davidgomes)]

Newline after diff line 118.

[lp:~junrrein/granite/fixed-tabs]

608. By Julián Unrrein on 2013-07-17

Improve coding style.

[Julián Unrrein (junrrein)]

Applied David's suggestion.

[David Gomes (davidgomes)]

Rejected in favor of https://code.launchpad.net/~gangsterveggies/granite/fix-bug-959553/+merge/180783.

Decided this together with Daniel, Julian and Pedro.

review: Disapprove

Unmerged revisions

608. By Julián Unrrein on 2013-07-17

Improve coding style.

607. By Julián Unrrein on 2013-07-15

Remove duplicated operations.

606. By Julián Unrrein on 2013-07-15

Merge from trunk.

605. By Julián Unrrein on 2013-07-14

Set tab properties correctly when moving them to other notebooks.

604. By Julián Unrrein on 2013-07-03

[DynamicNotebook] Moved a couple of responsibilites from DynamicNotebook to Tab.

603. By Julián Unrrein on 2013-07-03

Improve the coding style.

602. By Julián Unrrein on 2013-07-01

Revert changes to granite-demo.

601. By Julián Unrrein on 2013-07-01

[DynamicNotebook] Make the "Close tab" and "Open in a new Window" menuitems non-sensitive for a fixed tab.

600. By Julián Unrrein on 2013-07-01

[DynamicNotebook] Don't allow fixed tabs to be closed, unless "remove_tab_forced" is used.

599. By Julián Unrrein on 2013-07-01

Correct the previous commit.

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2013-07-13 22:40:24 +0000
+++ lib/Widgets/DynamicNotebook.vala	2013-07-17 21:34:27 +0000
@@ -84,8 +84,10 @@
             get { return _fixed; }
             set {
                 if (value != _fixed) {
-                    _label.visible = value;
-                    close.visible = value;
+                    _label.visible = !value;
+                    close.visible = !value;
+                    close_m.sensitive = !value;
+                    new_window_m.sensitive = !value;
                 }
                 _fixed = value;
             }
@@ -95,6 +97,7 @@
         public Gtk.Menu menu { get; set; }
 
         //we need to be able to toggle those from the notebook
+        internal Gtk.MenuItem close_m;
         internal Gtk.MenuItem new_window_m;
         internal Gtk.MenuItem duplicate_m;
 
@@ -132,12 +135,13 @@
             this.page = page ?? new Gtk.Label("");
             page_container.show_all ();
 
+            fixed = false;
             restore_data = "";
 
             this.show_all ();
 
             menu = new Gtk.Menu ();
-            var close_m = new Gtk.MenuItem.with_label (_("Close Tab"));
+            close_m = new Gtk.MenuItem.with_label (_("Close Tab"));
             var close_other_m = new Gtk.MenuItem.with_label ("");
             new_window_m = new Gtk.MenuItem.with_label (_("Open in a new Window"));
             duplicate_m = new Gtk.MenuItem.with_label (_("Duplicate"));
@@ -425,6 +429,7 @@
 
         private int tab_width = 150;
         private int max_tab_width = 150;
+        private int fixed_tab_width = 25;
 
         public signal void tab_added (Tab tab);
         public signal bool tab_removed (Tab tab);
@@ -621,12 +626,14 @@
                 return false;
             });
 
+            notebook.page_added.connect (on_page_added);
             notebook.switch_page.connect (on_switch_page);
             notebook.page_reordered.connect (on_page_reordered);
             notebook.create_window.connect (on_create_window);
         }
 
         ~Notebook () {
+            notebook.page_added.disconnect (on_page_added);
             notebook.switch_page.disconnect (on_switch_page);
             notebook.page_reordered.disconnect (on_page_reordered);
             notebook.create_window.disconnect (on_create_window);
@@ -641,6 +648,11 @@
             y += button_alloc.y + button_alloc.height + 1;
         }
 
+        void on_page_added (Gtk.Widget page, uint pagenum) {
+            var tab = this.get_tab_by_index ((int) pagenum);
+            tab.notify["fixed"].connect (on_tab_fixed_set);
+        }
+
         void on_switch_page (Gtk.Widget page, uint pagenum) {
             var new_tab = notebook.get_tab_label (page) as Tab;
 
@@ -662,8 +674,22 @@
             if (n_tabs == 0)
                 return;
 
+            var fixed_tabs = 0;
+            foreach (var tab in this.tabs) {
+                if (tab.fixed)
+                    fixed_tabs++;
+            }
+
+            var fixed_tabs_width_sum = fixed_tabs * fixed_tab_width;
+
             var offset = 130;
-            this.tab_width = (this.get_allocated_width () - offset) / this.notebook.get_n_pages ();
+            
+            if (this.notebook.get_n_pages () > fixed_tabs)
+                this.tab_width = (this.get_allocated_width () - offset - fixed_tabs_width_sum) 
+                                  / (this.notebook.get_n_pages () - fixed_tabs);
+            else
+                this.tab_width = max_tab_width;
+
             if (tab_width > max_tab_width)
                 tab_width = max_tab_width;
 
@@ -671,7 +697,11 @@
                 tab_width = 0;
 
             for (var i = 0; i < this.notebook.get_n_pages (); i++) {
-                this.notebook.get_tab_label (this.notebook.get_nth_page (i)).width_request = tab_width;
+                var tab = this.get_tab_by_index (i);
+                if (tab.fixed)
+                    this.notebook.get_tab_label (this.notebook.get_nth_page (i)).width_request = fixed_tab_width;
+                else
+                    this.notebook.get_tab_label (this.notebook.get_nth_page (i)).width_request = tab_width;
             }
             
             this.notebook.resize_children ();
@@ -687,8 +717,20 @@
             insert_tab (tab, -1);
             this.tab_restored (tab);
         }
+        
+        private void on_tab_fixed_set (Object object, ParamSpec paramspec) {
+            var tab = object as Tab;
+
+            if (this.get_tab_position (tab) != -1) {
+                notebook.set_tab_detachable (tab.page_container, this.allow_new_window && !tab.fixed);
+                this.recalc_size ();
+            }
+        }
 
         public void remove_tab (Tab tab) {
+            if (tab.fixed)
+                return;
+
             if (Signal.has_handler_pending (this, Signal.lookup ("tab-removed", typeof (DynamicNotebook)), 0, true)) {
                 var sure = tab_removed (tab);
                 if (!sure)
@@ -778,7 +820,7 @@
                 i = this.notebook.insert_page (tab.page_container, tab, index);
 
             this.notebook.set_tab_reorderable (tab.page_container, this.allow_drag);
-            this.notebook.set_tab_detachable  (tab.page_container, this.allow_new_window);
+            this.notebook.set_tab_detachable  (tab.page_container, this.allow_new_window && !tab.fixed);
 
             tab._icon.visible = show_icons;
             tab.duplicate_m.visible = allow_duplication;