Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAgustin Zubiaga <aguz@sugarlabs.org>2012-10-23 01:09:29 (GMT)
committer Agustin Zubiaga <aguz@sugarlabs.org>2012-10-23 01:09:29 (GMT)
commit20ba359060e4fa83c2f5272643dab93df909ca27 (patch)
tree5ef0c90ba5d5ab5e50b21b0c74a9c2b30fd274ad
parent0e53422d4e4618c9fd143a0e8bc391a10c4ed55b (diff)
Revert "Remove image vibration in zoom in (touch)"
This reverts commit 163e6b5e8110e5106fa57dc9d1f4a825c1851e3a.
-rw-r--r--ImageViewerActivity.py15
1 files changed, 0 insertions, 15 deletions
diff --git a/ImageViewerActivity.py b/ImageViewerActivity.py
index f0b7570..f17d4cf 100644
--- a/ImageViewerActivity.py
+++ b/ImageViewerActivity.py
@@ -116,7 +116,6 @@ class ImageViewerActivity(activity.Activity):
self._zoom_in_button = None
self._fileserver = None
self._fileserver_tube_id = None
- self._scroll_pos = (0, 0)
self.view = ImageView.ImageViewer()
@@ -135,9 +134,7 @@ class ImageViewerActivity(activity.Activity):
toolbar_box.show()
vadj = Gtk.Adjustment()
- vadj.connect('value-changed', self._scrolledwindow_moved)
hadj = Gtk.Adjustment()
- hadj.connect('value-changed', self._scrolledwindow_moved)
self.sw = Gtk.ScrolledWindow(hadj, vadj)
self.view.parent = self.sw
# Avoid needless spacing
@@ -211,17 +208,6 @@ class ImageViewerActivity(activity.Activity):
# Wait for a successful join before trying to get the document
self.connect("joined", self._joined_cb)
- def _scrolledwindow_moved(self, adjustment):
- hadj = self.sw.get_hadjustment()
- vadj = self.sw.get_vadjustment()
-
- if not self._is_touching:
- self._scroll_pos = (hadj.get_value(), vadj.get_value())
- else:
- h, v = self._scroll_pos
- hadj.set_value(h)
- vadj.set_value(v)
-
def __scale_changed_cb(self, controller, scale):
if scale != self._last_scale:
self._last_scale = scale
@@ -229,7 +215,6 @@ class ImageViewerActivity(activity.Activity):
self.view._is_touching = True
self.view.set_zoom_relative(scale)
- self.view._is_touching = False
def handle_view_source(self):
raise NotImplementedError