Merge lp:~gary-lasker/software-center/restore-screenshot-thumb-cursor into lp:software-center

Proposed by Gary Lasker
Status: Merged
Merged at revision: 2589
Proposed branch: lp:~gary-lasker/software-center/restore-screenshot-thumb-cursor
Merge into: lp:software-center
Diff against target: 49 lines (+16/-2)
2 files modified
debian/changelog (+4/-1)
softwarecenter/ui/gtk3/widgets/thumbnail.py (+12/-1)
To merge this branch: bzr merge lp:~gary-lasker/software-center/restore-screenshot-thumb-cursor
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+84867@code.launchpad.net

Description of the change

Just a tiny fix to restore the zoom cursor that we traditionally display when hovering over the screenshot thumbnail in the details view.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-12-06 14:22:20 +0000
+++ debian/changelog 2011-12-08 00:11:50 +0000
@@ -4,8 +4,11 @@
4 - update dependency from python-gobject-cairo to4 - update dependency from python-gobject-cairo to
5 python-gi-cairo5 python-gi-cairo
6 - update Vcs-Bzr to point to trunk6 - update Vcs-Bzr to point to trunk
7 * lp:~gary-lasker/software-center/restore-screenshot-thumb-cursor:
8 - restore the zoom cursor when hovering over a screenshot thumbnail
9 in the details view
710
8 -- Gary Lasker <gary.lasker@canonical.com> Tue, 06 Dec 2011 09:19:54 -050011 -- Gary Lasker <gary.lasker@canonical.com> Wed, 07 Dec 2011 19:06:10 -0500
912
10software-center (5.1.3) precise; urgency=low13software-center (5.1.3) precise; urgency=low
1114
1215
=== modified file 'softwarecenter/ui/gtk3/widgets/thumbnail.py'
--- softwarecenter/ui/gtk3/widgets/thumbnail.py 2011-11-13 09:28:35 +0000
+++ softwarecenter/ui/gtk3/widgets/thumbnail.py 2011-12-08 00:11:50 +0000
@@ -145,7 +145,7 @@
145 except:145 except:
146 self._zoom_cursor = None146 self._zoom_cursor = None
147147
148 # convienience class for handling the downloading (or not) of148 # convenience class for handling the downloading (or not) of
149 # any screenshot149 # any screenshot
150 self.loader = SimpleFileDownloader()150 self.loader = SimpleFileDownloader()
151 self.loader.connect(151 self.loader.connect(
@@ -219,8 +219,19 @@
219 self.thumbnails.connect(219 self.thumbnails.connect(
220 "thumb-selected", self.on_thumbnail_selected)220 "thumb-selected", self.on_thumbnail_selected)
221 self.button.connect("clicked", self.on_clicked)221 self.button.connect("clicked", self.on_clicked)
222 self.button.connect('enter-notify-event', self._on_enter)
223 self.button.connect('leave-notify-event', self._on_leave)
222 self.show_all()224 self.show_all()
223 return225 return
226
227 def _on_enter(self, widget, event):
228 if self.get_is_actionable():
229 self.get_window().set_cursor(self._zoom_cursor)
230 return
231
232 def _on_leave(self, widget, event):
233 self.get_window().set_cursor(None)
234 return
224235
225 def _on_key_press(self, widget, event):236 def _on_key_press(self, widget, event):
226 # react to spacebar, enter, numpad-enter237 # react to spacebar, enter, numpad-enter

Subscribers

People subscribed via source and target branches