Merge lp:~evfool/software-center/lp875043 into lp:software-center

[Robert Roth]

The branch contains a fix to only count a button release from exhibit as a click and activate the exhibit if both the button press and the release happened inside the exhibit. (bug #875043 happens as a result of this, as when double-clicking, the second clicks release event has been registered as a click on the exhibit)

[Michael Vogt (mvo)]

On Sat, Oct 15, 2011 at 04:16:27PM -0000, Robert Roth wrote:
> Robert Roth has proposed merging lp:~evfool/software-center/lp875043 into lp:software-center.

Thanks a lot Robert! Looks great.

> Requested reviews:
> Michael Vogt (mvo)
> Related bugs:
> Bug #875043 in software-center (Ubuntu): "Double clicking to maximise causes advert click through"
> https://bugs.launchpad.net/ubuntu/+source/software-center/+bug/875043
>
> For more details, see:
> https://code.launchpad.net/~evfool/software-center/lp875043/+merge/79477
>
> The branch contains a fix to only count a button release from exhibit as a click and activate the exhibit if both the button press and the release happened inside the exhibit. (bug #875043 happens as a result of this, as when double-clicking, the second clicks release event has been registered as a click on the exhibit)
> --
> https://code.launchpad.net/~evfool/software-center/lp875043/+merge/79477
> You are requested to review the proposed merge of lp:~evfool/software-center/lp875043 into lp:software-center.

> === modified file 'softwarecenter/ui/gtk3/widgets/exhibits.py'
> --- softwarecenter/ui/gtk3/widgets/exhibits.py 2011-10-12 15:34:18 +0000
> +++ softwarecenter/ui/gtk3/widgets/exhibits.py 2011-10-15 16:15:28 +0000
> @@ -263,6 +263,7 @@
>
> self.cursor = 0
> self._timeout = 0
> + self.pressed = False
>
> self.alpha = 1.0
> self.image = None
> @@ -287,10 +288,12 @@
> def _init_event_handling(self):
> self.set_can_focus(True)
> self.set_events(Gdk.EventMask.BUTTON_RELEASE_MASK|
> + Gdk.EventMask.BUTTON_PRESS_MASK|
> Gdk.EventMask.ENTER_NOTIFY_MASK|
> Gdk.EventMask.LEAVE_NOTIFY_MASK)
> self.connect("enter-notify-event", self.on_enter_notify)
> self.connect("leave-notify-event", self.on_leave_notify)
> + self.connect("button-press-event", self.on_button_press)
> self.connect("button-release-event", self.on_button_release)
> self.connect("key-press-event", self.on_key_press)
>
> @@ -315,11 +318,20 @@
> def on_button_release(self, widget, event):
> if not point_in(self.get_allocation(),
> int(event.x), int(event.y)):
> + self.pressed = False
> return
>
> exhibit = self.exhibits[self.cursor]
> - if exhibit.package_names:
> + if exhibit.package_names and self.pressed:
> self.emit("show-exhibits-clicked", exhibit)
> + self.pressed = False
> + return
> +
> + def on_button_press(self, widget, event):
> + if not point_in(self.get_allocation(),
> + int(event.x), int(event.y)):
> + return
> + self.pressed = True
> return
>
> def on_key_press(self, widget, event):
>

=== modified file 'softwarecenter/ui/gtk3/widgets/exhibits.py'
--- softwarecenter/ui/gtk3/widgets/exhibits.py	2011-10-12 15:34:18 +0000
+++ softwarecenter/ui/gtk3/widgets/exhibits.py	2011-10-15 16:15:28 +0000
@@ -263,6 +263,7 @@
 
         self.cursor = 0
         self._timeout = 0
+        self.pressed = False
 
         self.alpha = 1.0
         self.image = None 
@@ -287,10 +288,12 @@
     def _init_event_handling(self):
         self.set_can_focus(True)
         self.set_events(Gdk.EventMask.BUTTON_RELEASE_MASK|
+                        Gdk.EventMask.BUTTON_PRESS_MASK|
                         Gdk.EventMask.ENTER_NOTIFY_MASK|
                         Gdk.EventMask.LEAVE_NOTIFY_MASK)
         self.connect("enter-notify-event", self.on_enter_notify)
         self.connect("leave-notify-event", self.on_leave_notify)
+        self.connect("button-press-event", self.on_button_press)
         self.connect("button-release-event", self.on_button_release)
         self.connect("key-press-event", self.on_key_press)
 
@@ -315,11 +318,20 @@
     def on_button_release(self, widget, event):
         if not point_in(self.get_allocation(),
                         int(event.x), int(event.y)):
+            self.pressed = False
             return
 
         exhibit = self.exhibits[self.cursor]
-        if exhibit.package_names:
+        if exhibit.package_names and self.pressed:
             self.emit("show-exhibits-clicked", exhibit)
+        self.pressed = False
+        return
+
+    def on_button_press(self, widget, event):
+        if not point_in(self.get_allocation(),
+                        int(event.x), int(event.y)):
+            return
+        self.pressed = True
         return
 
     def on_key_press(self, widget, event):