diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-04-14 22:43:44 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-04-14 22:43:44 -0300 |
| commit | ec4ef2d2e794819548d731f93728266d31261d71 (patch) | |
| tree | 6c2940a9029d07a22288c93684dac19cc39de7ed /scene/gui | |
| parent | 162d2ebe4f1a6da2da62ad45c4cbfb161157d31d (diff) | |
-Added google play services (needed for some stuff)
-Added new screen resizing options, stretch_2d is removed, new much more flexible ones.
-Fixed bug in viewport (can create more instances in 3d-in-2d demo now)
-Can set android permissions and screen sizes manually in the export settings
-Changed export templates extension to .tpz (too many people unzipped the manually..)
-File dialog now ensures that the proper extension is used (will not allow to save without it)
-Fixed bug that made collision exceptions not work in 2D
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/control.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 9e0faac716..e0604b7cb8 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -955,7 +955,7 @@ void Control::_window_input_event(InputEvent p_event) { window->key_event_accepted=false; - Point2 mpos =(get_viewport_transform()).affine_inverse().xform(Point2(p_event.mouse_button.x,p_event.mouse_button.y)); + Point2 mpos =(get_canvas_transform()).affine_inverse().xform(Point2(p_event.mouse_button.x,p_event.mouse_button.y)); if (p_event.mouse_button.pressed) { @@ -1102,7 +1102,7 @@ void Control::_window_input_event(InputEvent p_event) { window->key_event_accepted=false; - Matrix32 localizer = (get_viewport_transform()).affine_inverse(); + Matrix32 localizer = (get_canvas_transform()).affine_inverse(); Size2 pos = localizer.xform(Size2(p_event.mouse_motion.x,p_event.mouse_motion.y)) - _window_get_pos(); Vector2 speed = localizer.basis_xform(Point2(p_event.mouse_motion.speed_x,p_event.mouse_motion.speed_y)); Vector2 rel = localizer.basis_xform(Point2(p_event.mouse_motion.relative_x,p_event.mouse_motion.relative_y)); |