Merge pull request kivy-garden#14 from andnovar/on_pos_bind

matham · matham · commit 176ad807a4b0 · 2015-08-26T20:57:15.000-04:00
pos bound backend_kivy calls draw() and backend_kivyagg change pos of…
diff --git a/backend_kivy.py b/backend_kivy.py
@@ -999,6 +999,7 @@ class FigureCanvasKivy(FocusBehavior, Widget, FigureCanvasBase):
     def __init__(self, figure, **kwargs):
         Window.bind(mouse_pos=self._on_mouse_pos)
         self.bind(size=self._on_size_changed)
+        self.bind(pos=self._on_pos_changed)
         self.entered_figure = True
         self.figure = figure
         super(FigureCanvasKivy, self).__init__(figure=self.figure, **kwargs)
@@ -1126,6 +1127,9 @@ def leave_notify_event(self, guiEvent=None):
         event = Event('figure_leave_event', self, guiEvent)
         self.callbacks.process('figure_leave_event', event)
 
+    def _on_pos_changed(self, *args):
+        self.draw()
+
     def _on_size_changed(self, *args):
         '''Changes the size of the matplotlib figure based on the size of the
            widget. The widget will change size according to the parent Layout
diff --git a/backend_kivyagg.py b/backend_kivyagg.py
@@ -176,8 +176,8 @@ def __init__(self, figure, **kwargs):
         self.figure = figure
         self.bind(size=self._on_size_changed)
         super(FigureCanvasKivyAgg, self).__init__(figure=self.figure, **kwargs)
-        self.img = None
         self.img_texture = None
+        self.img_rect = None
         self.blit()
 
     def draw(self):
@@ -201,26 +201,32 @@ def draw(self):
         texture = Texture.create(size=(w, h))
         texture.flip_vertical()
         with self.canvas:
-            Rectangle(texture=texture, pos=self.pos, size=(w, h))
+            self.img_rect = Rectangle(texture=texture, pos=self.pos,
+                                      size=(w, h))
         texture.blit_buffer(bytes(buf_rgba), colorfmt='rgba', bufferfmt='ubyte')
         self.img_texture = texture
 
     filetypes = FigureCanvasKivy.filetypes.copy()
     filetypes['png'] = 'Portable Network Graphics'
 
+    def _on_pos_changed(self, *args):
+        if self.img_rect is not None:
+            self.img_rect.pos = self.pos
+
     def _print_image(self, filename, *args, **kwargs):
         '''Write out format png. The image is saved with the filename given.
         '''
         l, b, w, h = self.figure.bbox.bounds
+        img = None
         if self.img_texture is None:
             texture = Texture.create(size=(w, h))
             texture.blit_buffer(bytes(self.get_renderer().buffer_rgba()),
                                 colorfmt='rgba', bufferfmt='ubyte')
             texture.flip_vertical()
-            self.img = Image(texture)
+            img = Image(texture)
         else:
-            self.img = Image(self.img_texture)
-        self.img.save(filename)
+            img = Image(self.img_texture)
+        img.save(filename)
 
 ''' Standard names that backend.__init__ is expecting '''
 FigureCanvas = FigureCanvasKivyAgg
