Fix misalignment of multi-touch emu feedback

kivy/core/window/__init__.py

@@ -528,6 +528,18 @@ def _get_system_size(self):
     '''Real size of the window ignoring rotation.
     '''
 
+    def _get_effective_size(self):
+        '''On density=1 and non-ios displays, return system_size, else
+        return scaled / rotated size.
+
+        Used by MouseMotionEvent.update_graphics() and WindowBase.on_motion().
+        '''
+        w, h = self.system_size
+        if platform == 'ios' or self._density != 1:
+            w, h = self.size
+
+        return w, h
+
     borderless = BooleanProperty(False)
     '''When set to True, this property removes the window border/decoration.
 
@@ -942,9 +954,7 @@ def on_motion(self, etype, me):
                 The Motion Event currently dispatched.
         '''
         if me.is_touch:
-            w, h = self.system_size
-            if platform == 'ios' or self._density != 1:
-                w, h = self.size
+            w, h = self._get_effective_size()
             me.scale_for_screen(w, h, rotation=self._rotation,
                                 smode=self.softinput_mode,
                                 kheight=self.keyboard_height)

kivy/input/providers/mouse.py

@@ -105,10 +105,13 @@ def update_graphics(self, win, create=False):
             self.ud._drawelement = de
         if de is not None:
             self.push()
-            self.scale_for_screen(
-                win.system_size[0],
-                win.system_size[1],
-                rotation=win.rotation)
+
+            # use same logic as WindowBase.on_motion() so we get correct
+            # coordinates when _density != 1
+            w, h = win._get_effective_size()
+
+            self.scale_for_screen(w, h, rotation=win.rotation)
+
             de[1].pos = self.x - 10, self.y - 10
             self.pop()