Merge lp:~niclasl/granite/tab-icon-visibility into lp:~elementary-pantheon/granite/granite

[Niclas Lockner]

Implements show_icon property in tab objects which allows for correct icon visibility state after changing the 'working' property of a given tab.

When a tab's working property is set to false, and when a pinned non-working tab is unpinned, the tab's icon visibility is set to true even though the DynamicNotebook object's show_icons property is false. This branch fixes these bugs.

[Sergey "Shnatsel" Davidoff (shnatsel)]

This very well may break process completion notifications in pantheon-terminal - they use tab icons in a slightly wonky way that worked up until now, but may break after this change. In that case Terminal should be fixed.

[Niclas Lockner (niclasl)]

I didn't see any regressions when I tested pantheon-terminal with this branch installed

[lp:~niclasl/granite/tab-icon-visibility]

760. By Niclas Lockner on 2014-07-31

Code-style

[David Gomes (davidgomes)]

review: Approve

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2014-04-05 09:09:57 +0000
+++ lib/Widgets/DynamicNotebook.vala	2014-07-31 12:42:38 +0000
@@ -122,6 +122,16 @@
             }
         }
 
+        bool _show_icon;
+        internal bool show_icon {
+            get { return _show_icon; }
+
+            set {
+                _icon.visible = value && !working;
+                _show_icon = value;
+            }
+        }
+
         internal Gtk.Image _icon;
         public GLib.Icon? icon {
             owned get { return _icon.gicon;  }
@@ -132,7 +142,11 @@
         bool __working;
         public bool working {
             get { return __working; }
-            set { __working = _working.visible = value; _icon.visible = !value; }
+
+            set {
+                __working = _working.visible = value;
+                _icon.visible = show_icon && !value;
+            }
         }
 
         public Pango.EllipsizeMode ellipsize_mode {
@@ -532,7 +546,7 @@
             get { return _show_icons; }
             set {
                 if (_show_icons != value) {
-                    tabs.foreach ((t) => t._icon.visible = (value && !t.working));
+                    tabs.foreach ((t) => t.show_icon = value);
                 }
                 _show_icons = value;
             }
@@ -1056,14 +1070,6 @@
                 return;
             }
 
-            var pin_state = !tab.pinned;
-            if (pin_state) {
-                tab._icon.visible = !tab.working;
-                tab.closable = tabs_closable;
-            } else {
-                tab._icon.visible = show_icons && !tab.working;
-            }
-
             recalc_order ();
             recalc_size ();
         }
@@ -1133,7 +1139,7 @@
             this.notebook.set_tab_reorderable (tab.page_container, this.allow_drag);
             this.notebook.set_tab_detachable  (tab.page_container, this.allow_new_window);
 
-            tab._icon.visible = show_icons && !tab.working;
+            tab.show_icon = show_icons;
             tab.duplicate_m.visible = allow_duplication;
             tab.new_window_m.visible = allow_new_window;
             tab.pin_m.visible = allow_pinning;