asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11743 from groud/zoom_button_fix

Browse source 
Fix zoom button not zooming on the screen center
This commit is contained in:
Poommetee Ketson 2017-10-02 23:42:43 +07:00 committed by GitHub
commit 980e78749b
2 changed files with 22 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -1219,50 +1219,26 @@ void CanvasItemEditor::_viewport_base_gui_input(const Ref<InputEvent> &p_event)
if (b->get_button_index() == BUTTON_WHEEL_DOWN) { if (b->get_button_index() == BUTTON_WHEEL_DOWN) {
// Scroll or pan down // Scroll or pan down
if (bool(EditorSettings::get_singleton()->get("editors/2d/scroll_to_pan"))) { if (bool(EditorSettings::get_singleton()->get("editors/2d/scroll_to_pan"))) {
v_scroll->set_value(v_scroll->get_value() + int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor()); v_scroll->set_value(v_scroll->get_value() + int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor());
_update_scroll(0);
viewport->update();
} else { } else {
_zoom_on_position(zoom * (1 - (0.05 * b->get_factor())), viewport_scrollable->get_transform().affine_inverse().xform(b->get_position()));
if (zoom < MIN_ZOOM)
return;
float prev_zoom = zoom;
zoom = zoom * (1 - (0.05 * b->get_factor()));
{
Point2 ofs = viewport_scrollable->get_transform().affine_inverse().xform(b->get_position());
ofs = ofs / prev_zoom - ofs / zoom;
h_scroll->set_value(h_scroll->get_value() + ofs.x);
v_scroll->set_value(v_scroll->get_value() + ofs.y);
}
} }
_update_scroll(0);
viewport->update();
return; return;
} }
if (b->get_button_index() == BUTTON_WHEEL_UP) { if (b->get_button_index() == BUTTON_WHEEL_UP) {
// Scroll or pan up // Scroll or pan up
if (bool(EditorSettings::get_singleton()->get("editors/2d/scroll_to_pan"))) { if (bool(EditorSettings::get_singleton()->get("editors/2d/scroll_to_pan"))) {
v_scroll->set_value(v_scroll->get_value() - int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor()); v_scroll->set_value(v_scroll->get_value() - int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor());
_update_scroll(0);
viewport->update();
} else { } else {
if (zoom > MAX_ZOOM) return; _zoom_on_position(zoom * ((0.95 + (0.05 * b->get_factor())) / 0.95), viewport_scrollable->get_transform().affine_inverse().xform(b->get_position()));
float prev_zoom = zoom;
zoom = zoom * ((0.95 + (0.05 * b->get_factor())) / 0.95);
{
Point2 ofs = viewport_scrollable->get_transform().affine_inverse().xform(b->get_position());
ofs = ofs / prev_zoom - ofs / zoom;
h_scroll->set_value(h_scroll->get_value() + ofs.x);
v_scroll->set_value(v_scroll->get_value() + ofs.y);
}
} }
_update_scroll(0);
viewport->update();
return; return;
} }
@ -3069,31 +3045,32 @@ void CanvasItemEditor::_set_full_rect() {
undo_redo->commit_action(); undo_redo->commit_action();
} }
void CanvasItemEditor::_zoom_minus() { void CanvasItemEditor::_zoom_on_position(float p_zoom, Point2 p_position) {
if (zoom < MIN_ZOOM) if (p_zoom < MIN_ZOOM || p_zoom > MAX_ZOOM)
return; return;
zoom /= 2.0;
float prev_zoom = zoom;
zoom = p_zoom;
Point2 ofs = p_position;
ofs = ofs / prev_zoom - ofs / zoom;
h_scroll->set_value(h_scroll->get_value() + ofs.x);
v_scroll->set_value(v_scroll->get_value() + ofs.y);
_update_scroll(0); _update_scroll(0);
viewport->update(); viewport->update();
viewport_base->update(); viewport_base->update();
} }
void CanvasItemEditor::_zoom_minus() {
_zoom_on_position(zoom / 2.0, viewport_scrollable->get_size() / 2.0);
}
void CanvasItemEditor::_zoom_reset() { void CanvasItemEditor::_zoom_reset() {
zoom = 1; _zoom_on_position(1.0, viewport_scrollable->get_size() / 2.0);
_update_scroll(0);
viewport->update();
viewport_base->update();
} }
void CanvasItemEditor::_zoom_plus() { void CanvasItemEditor::_zoom_plus() {
if (zoom > MAX_ZOOM) _zoom_on_position(zoom * 2.0, viewport_scrollable->get_size() / 2.0);
return;
zoom *= 2.0;
_update_scroll(0);
viewport->update();
viewport_base->update();
} }
void CanvasItemEditor::_toggle_snap(bool p_status) { void CanvasItemEditor::_toggle_snap(bool p_status) {

1
editor/plugins/canvas_item_editor_plugin.h
View file

@ -387,6 +387,7 @@ class CanvasItemEditor : public VBoxContainer {
void _set_anchors_preset(Control::LayoutPreset p_preset); void _set_anchors_preset(Control::LayoutPreset p_preset);
void _set_full_rect(); void _set_full_rect();
void _zoom_on_position(float p_zoom, Point2 p_position = Point2());
void _zoom_minus(); void _zoom_minus();
void _zoom_reset(); void _zoom_reset();
void _zoom_plus(); void _zoom_plus();