Fixing tree selection in ping-pong mode

3 files changed, 7 insertions, 2 deletions

diff --git a/TODO b/TODO
index 39294d5..4ee347f 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,8 @@ New functions:
     - Select time between frames
 Fixes:
     - Enable drag and drop between frames.
-    - Correct frame selection in ping pong mode
 Bugs:
     - Doesn't load in return mode by default.
+    - Slow transition after the latest image in ping-pong mode
     - Doesn't select another frame when the last frame is removed.
+    - Bad scaled image in the first frame only in first time.
diff --git a/animation.py b/animation.py
index 95815ab..d52ff6e 100644
--- a/animation.py
+++ b/animation.py
@@ -47,6 +47,7 @@ class Animation(gtk.Image):
         self._mode = NORMAL_MODE
         self._running = False
         self.images = []
+        self.images_reverse = False
 
         self._size = width, height
         self._sleep_time = int(sleep_time * 1000)
@@ -135,10 +136,11 @@ class Animation(gtk.Image):
                                                 not self._mode == NORMAL_MODE:
             if self._mode == PING_PONG_MODE:
                 self.images.reverse()
+                self.images_reverse = not self.images_reverse
 
             self._current_image = 0
 
-        self.emit("current-frame-updated", self._current_image)
+        self.emit("current-frame-updated", self.current_image)
 
         return True
 
diff --git a/frames_list.py b/frames_list.py
index 7c31882..a2f7747 100644
--- a/frames_list.py
+++ b/frames_list.py
@@ -75,6 +75,8 @@ class FramesList(gtk.ScrolledWindow):
         self.frames = count - 1
 
     def _select_frame(self, widget, index):
+        if widget.images_reverse:
+            index = len(widget.images) - index
         self.selection.select_iter(self.store.get_iter(index))
         selected_path = self.store.get_path(self.selection.get_selected()[1])
         self.treeview.scroll_to_cell(selected_path)