Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8740 from pixelpicosean/scrollingWithFactor

Browse source 
Implemented scrolling factor for precision trackpads for 2.1
This commit is contained in:
Rémi Verschelde 2017-05-15 07:57:05 +02:00 • committed by GitHub
commit aa046a85dc
15 changed files with 111 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -1041,7 +1041,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
return;
float prev_zoom = zoom;
zoom = zoom * 0.95;
zoom = zoom * (1 - (0.05 * b.factor));
{
Point2 ofs(b.x, b.y);
ofs = ofs / prev_zoom - ofs / zoom;
@ -1059,7 +1059,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
return;
float prev_zoom = zoom;
zoom = zoom * (1.0 / 0.95);
zoom = zoom * ((0.95 + (0.05 * b.factor)) / 0.95);
{
Point2 ofs(b.x, b.y);
ofs = ofs / prev_zoom - ofs / zoom;

4
editor/plugins/polygon_2d_editor_plugin.cpp
View file

@ -523,10 +523,10 @@ void Polygon2DEditor::_uv_input(const InputEvent &p_input) {
} else if (mb.button_index == BUTTON_WHEEL_UP && mb.pressed) {
uv_zoom->set_val(uv_zoom->get_val() / 0.9);
uv_zoom->set_val(uv_zoom->get_val() / (1 - (0.1 * mb.factor)));
} else if (mb.button_index == BUTTON_WHEEL_DOWN && mb.pressed) {
uv_zoom->set_val(uv_zoom->get_val() * 0.9);
uv_zoom->set_val(uv_zoom->get_val() * (1 - (0.1 * mb.factor)));
}
} else if (p_input.type == InputEvent::MOUSE_MOTION) {