image-timer.rb in rabbit-3.0.2

- old
+ new

@@ -36,11 +36,11 @@
 }
 
 @image_timer_target_paths ||= [Slide]
 
 match(*@image_timer_target_paths) do |slides|
-  slides.delete_post_draw_proc_by_name(proc_name)
+  slides.delete_pre_draw_proc_by_name(proc_name)
   stop_auto_redraw_timer
 
   break if @image_timer_uninstall
 
   init_proc_name = "#{init_proc_name_prefix}.#{canvas.__id__}"
@@ -49,21 +49,21 @@
       canvas.start_timer(@image_timer_limit) if canvas.rest_time.nil?
       if @image_timer_auto_update && !@image_timer_auto_updating
         @image_timer_auto_updating = true
         start_auto_redraw_timer(@image_timer_interval)
       end
-      slide.delete_post_draw_proc_by_name(init_proc_name)
+      slide.delete_pre_draw_proc_by_name(init_proc_name)
     end
     [x, y, w, h]
   end
 
   loader = ImageLoader.new(find_file(@image_timer_image))
 
   max_width = nil
   base_y = nil
 
-  slides.add_post_draw_proc(proc_name) do |slide, canvas, x, y, w, h, simulation|
+  draw = lambda do |slide, canvas, x, y, w, h, simulation|
     margin_left = @image_timer_margin_left || slide.margin_left
     margin_right = @image_timer_margin_right || slide.margin_right
     margin_bottom = @image_timer_margin_bottom || slide.margin_bottom
 
     if simulation
@@ -108,7 +108,12 @@
           end
         end
       end
     end
     [x, y, w, h]
+  end
+  if slides[0].is_a?(PopplerSlide)
+    slides.add_post_draw_proc(proc_name, &draw)
+  else
+    slides.add_pre_draw_proc(proc_name, &draw)
   end
 end