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

[Julien Spautz]

Fixes bug #1157257 by implementing the following 2 shortcuts:

· duplicate tab on double click
· close other tabs on Shift + middle click

The first one was in the original spec: https://blueprints.launchpad.net/granite/+spec/tabbar

Dan confirmed the bug so I assume he agrees with the changes.

[David Gomes (davidgomes)]

Align diff lines 10, 11, and 12 correctly according to line 9.

review: Needs Fixing

[David Gomes (davidgomes)]

Good code, works just fine, good job.

review: Approve

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

544. By Julien Spautz on 2013-03-20

Fixed bug #1157257 - new mouse shortcuts for DynamicNotebook. Approved by David Gomes.

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2013-03-19 14:51:46 +0000
+++ lib/Widgets/DynamicNotebook.vala	2013-03-20 19:41:34 +0000
@@ -20,6 +20,11 @@
 
 namespace Granite.Widgets {
 
+    // a mask to ignore modifiers like num lock or caps lock that are irrelevant to keyboard shortcuts
+    internal const Gdk.ModifierType MODIFIER_MASK = (Gdk.ModifierType.SHIFT_MASK |
+                                                     Gdk.ModifierType.SUPER_MASK |
+                                                     Gdk.ModifierType.CONTROL_MASK |
+                                                     Gdk.ModifierType.MOD1_MASK);
     /**
      * This is a standard tab which can be used in a notebook to form a tabbed UI.
      */
@@ -134,24 +139,26 @@
             duplicate_m.activate.connect (() => duplicate () );
 
             lbl.button_press_event.connect ((e) => {
-                if (e.button == 2 && close.visible) { //if !close.visible, closable if false
+            
+                e.state &= MODIFIER_MASK;
+                
+                if (e.button == 2 && e.state == 0 && close.visible) {
                     this.closed ();
-                    return true;
+                } else if (e.button == 2 && e.state == Gdk.ModifierType.SHIFT_MASK && close.visible) {
+                    this.close_others ();
+                } else if (e.button == 1 && e.type == Gdk.EventType.2BUTTON_PRESS && duplicate_m.visible) {
+                    this.duplicate ();
                 } else if (e.button == 3) {
                     menu.popup (null, null, null, 3, e.time);
                     uint num_tabs = (this.get_parent () as Gtk.Container).get_children ().length ();
                     close_other_m.label = ngettext (_("Close Other Tab"), _("Close Other Tabs"), num_tabs - 1);
                     if (num_tabs == 1)
                         close_other_m.sensitive = false;
-                    return true;
+                } else {
+                    return false;
                 }
-
-                return false;
-            });
-
-            /* Disable the double click signal on the tab */
-            this.button_press_event.connect ((e) => {
-                return (e.type == Gdk.EventType.2BUTTON_PRESS);
+                
+                return true;
             });
 
             page_container.button_press_event.connect (() => { return true; }); //dont let clicks pass through