@@ -16,8 +16,6 @@
16# You should have received a copy of the GNU General Public License
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
19−from autopilot.input import Pointer, Touch
21from unity8.shell.emulators import UnityEmulatorBase
19from unity8.shell.emulators import UnityEmulatorBase
@@ -27,7 +25,6 @@ class DefaultIndicatorWidget(UnityEmulatorBase):
28 def __init__(self, *args, **kwargs):
26 def __init__(self, *args, **kwargs):
29 super(DefaultIndicatorWidget, self).__init__(*args, **kwargs)
27 super(DefaultIndicatorWidget, self).__init__(*args, **kwargs)
30− self.pointer = Pointer(Touch.create())
32 # TODO: submit to autopilot.introspection.types.Rectangle [alesage 2013-12-06]
29 # TODO: submit to autopilot.introspection.types.Rectangle [alesage 2013-12-06]
33 def get_center(self):
30 def get_center(self):
@@ -42,7 +39,7 @@ class DefaultIndicatorWidget(UnityEmulatorBase):
42 start_x, start_y = self.get_center()
39 start_x, start_y = self.get_center()
43 end_x = start_x
40 end_x = start_x
44 end_y = window.height
41 end_y = window.height
45− self.pointer.drag(
42+ self.pointing_device.drag(
46 start_x, start_y,
43 start_x, start_y,
47 end_x, end_y
44 end_x, end_y
@@ -53,7 +50,7 @@ class DefaultIndicatorWidget(UnityEmulatorBase):
53 end_x, end_y = self.get_center()
50 end_x, end_y = self.get_center()
54 start_x = end_x
51 start_x = end_x
55 start_y = window.height
52 start_y = window.height
56− self.pointer.drag(
53+ self.pointing_device.drag(
57 start_x, start_y,
54 start_x, start_y,
58 end_x, end_y
55 end_x, end_y