Fix text coordinates. Fixes #29.

Author: matham

backend_kivy.py

@@ -610,35 +610,37 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
            If the text is a math expression it will be rendered using a
            MathText parser.
         '''
-        if mtext and mtext.get_rotation_mode() == "anchor":
-            # Get anchor coordinates.
+        if mtext:
             transform = mtext.get_transform()
             ax, ay = transform.transform_point(mtext.get_position())
-            ay = self.widget.height - ay
 
-            angle_rad = angle * np.pi / 180.
+            angle_rad = mtext.get_rotation() * np.pi / 180.
             dir_vert = np.array([np.sin(angle_rad), np.cos(angle_rad)])
-            v_offset = np.dot(dir_vert, [(x - ax), (y - ay)])
-            ax = ax + v_offset * dir_vert[0]
-            ay = ay + v_offset * dir_vert[1]
-            x = ax
-            y = ay
+
+            if mtext.get_rotation_mode() == "anchor":
+                # if anchor mode, rotation is undone first
+                v_offset = np.dot(dir_vert, [(x - ax), (y - ay)])
+                ax = ax + v_offset * dir_vert[0]
+                ay = ay + v_offset * dir_vert[1]
 
             w, h, d = self.get_text_width_height_descent(s, prop, ismath)
-            ha = mtext.get_ha()
+            ha, va = mtext.get_ha(), mtext.get_va()
             if ha == "center":
-                x -= w / 2
+                ax -= w / 2
             elif ha == "right":
-                x -= w
-            elif ha == "left":
-                x += w
-            va = mtext.get_va()
+                ax -= w
             if va == "top":
-                y -= h
+                ay -= h
             elif va == "center":
-                y -= h / 2
-            elif va == "bottom":
-                y += h
+                ay -= h / 2
+
+            if mtext.get_rotation_mode() != "anchor":
+                # if not anchor mode, rotation is undone last
+                v_offset = np.dot(dir_vert, [(x - ax), (y - ay)])
+                ax = ax + v_offset * dir_vert[0]
+                ay = ay + v_offset * dir_vert[1]
+
+            x, y = ax, ay
 
         x += self.widget.x
         y += self.widget.y