Merge lp:~xapantu/granite/fix-957349 into lp:~elementary-pantheon/granite/granite

[xapantu]

Fix bug #957349: add a property for tab overlap

[Victor Martinez (victored)]

This is fine. Although I think it would be better if you did ALL the theming through the DynamicNotebook widget, since eventually it will be seen as a single widget by theme makers.

So -GraniteWidgetsDynamicNotebook-tab-overlap is desirable in order to follow the standard approach :)

review: Needs Fixing

[xapantu (xapantu)]

I don't like this idea, what if I want to use the tab bar as a
standalone widget? e.g. if I don't want the tabs to be stuck to the
notebook.
Le mercredi 21 mars 2012 à 05:03 +0000, Victor Eduardo a écrit :
> Review: Needs Fixing
>
> This is fine. Although I think it would be better if you did ALL the theming through the DynamicNotebook widget, since eventually it will be seen as a single widget by theme makers.
>
> So -GraniteWidgetsDynamicNotebook-tab-overlap is desirable in order to follow the standard approach :)

[Victor Martinez (victored)]

I only suggested that because Granite.Widgets.Tabs is an internal class, and thus no one can re-utilize the tabs at the moment. Besides, it won't appear in the documentation.

I'm not suggesting the removal of the current code. Just asking you to mirror the property in the DynamicNotebook widget, since you can set the tab-overlap property from there.

Thank you for your awesome work :)

[Victor Martinez (victored)]

Although we do need that property in the DynamicNotebook widget, there's nothing wrong with the code here, and then this shouldn't be on hold.

review: Approve

[Victor Martinez (victored)]

The close button in the active tab is misaligned. I hope you can fix that in trunk later :)

[xapantu (xapantu)]

Ah, yes, I saw that yesterday, it must be caused by a cast from double
to int or something like that, because here it is only 1-2 px. But yeah,
I'll fix it later :)

Le 26/03/2012 05:44, Victor Eduardo a écrit :
> The close button in the active tab is misaligned. I hope you can fix that in trunk later :)

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2012-03-19 18:39:32 +0000
+++ lib/Widgets/DynamicNotebook.vala	2012-03-20 18:28:19 +0000
@@ -118,7 +118,7 @@
     const double max_width = 200;
     const double min_width = 120;
     double width = max_width;
-    const double overlap = 3;
+    protected double overlap = 3;
     const int close_size = 16;
     const double close_margin = 1;
     const double y = 5;
@@ -157,9 +157,18 @@
 
     public signal void switch_page (Tab tab);
     public signal void page_removed (Tab tab);
+    
+    static construct {
+        install_style_property (new GLib.ParamSpecDouble ("tab-overlap",
+                                                       "Tab overlap",
+                                                       "Tab overlap",
+                                                       0, 50, 3,
+                                                       ParamFlags.READABLE));
+    }
 
     public Tabs () {
         tabs = new Gee.ArrayList<Tab>();
+        style_get ("tab-overlap", out overlap, null);
         
         if (style_provider == null) {
             style_provider = new Gtk.CssProvider ();