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

[Pedro Paredes]

DynamicNotebook: Fixed the bug #1184202 and the add_button's visibility is now optional.

Fixes the bug #1184202.

As requested, added a function set_button_visible (bool visible) that toggles the "New Tab" '+' button on and off depending on the 'visible' variable. Default setting is on.

[David Gomes (davidgomes)]

If a property is called "add_button_visible", you should use Vala's automatic set/get and the functions would automatically be called "set_add_button_visible" and "get_add_button_visible", you can see many examples of this feature on DynamicNotebook.vala, here's one:

        /**
         * Allow duplicating tabs
         */
        bool _allow_duplication = false;
        public bool allow_duplication {
            get { return _allow_duplication; }
            set {
                _allow_duplication = value;

                foreach (var tab in tabs) {
                    tab.duplicate_m.visible = value;
                }
            }
        }

review: Needs Fixing

[Pedro Paredes (gangsterveggies)]

> If a property is called "add_button_visible", you should use Vala's automatic
> set/get and the functions would automatically be called
> "set_add_button_visible" and "get_add_button_visible", you can see many
> examples of this feature on DynamicNotebook.vala, here's one:
>
> /**
> * Allow duplicating tabs
> */
> bool _allow_duplication = false;
> public bool allow_duplication {
> get { return _allow_duplication; }
> set {
> _allow_duplication = value;
>
> foreach (var tab in tabs) {
> tab.duplicate_m.visible = value;
> }
> }
> }

I had done it differently to follow the bug description suggestion, but you are right. Fixed it in revision 609.

[David Gomes (davidgomes)]

Remove diff line 11.

review: Needs Fixing

[David Gomes (davidgomes)]

>private bool _add_button_visible = true;
↓
bool _add_button_visible = true;

That's how all the other variables are declared above.

[David Gomes (davidgomes)]

Good job, thank you.

review: Approve

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2013-07-13 22:40:24 +0000
+++ lib/Widgets/DynamicNotebook.vala	2013-08-19 14:40:50 +0000
@@ -391,6 +391,25 @@
             }
         }
 
+        /**
+         * Controls the '+' add button visibility
+         */
+        bool _add_button_visible = true;
+        public bool add_button_visible {
+            get { return _add_button_visible; }
+            set {
+                if (value != _add_button_visible) {
+                    if (_add_button_visible) {
+                        this.notebook.set_action_widget (null, Gtk.PackType.START);                 
+                    } else {
+                        this.notebook.set_action_widget (add_button, Gtk.PackType.START);
+                    }
+
+                    _add_button_visible = value;
+                }
+            }
+        }
+
         public Tab current {
             get { return tabs.nth_data (notebook.get_current_page ()); }
             set { notebook.set_current_page (tabs.index (value)); }