blender/blender
147
472
Fork 688
Code Issues 6.7k Pull Requests 888 Projects 18 Wiki Activity

Fix #117185: Zooming out is slow on Windows precision touchpad #117341

Open
Andrii wants to merge 1 commits from pembem22/blender:precision-touchpad-zoom-out-speed into main
pull from: pembem22/blender:precision-touchpad-zoom-out-speed
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 14 Commits 1 Files Changed 1 +17 -5
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
intern/ghost/intern/GHOST_TrackpadWin32.cc
View File

@ -284,14 +284,16 @@ HRESULT GHOST_DirectManipulationViewportEventHandler::OnContentUpdated(
const float device_scale_factor = dpi / 96.0f;
const float scale = transform[0] * PINCH_SCALE_FACTOR;
const float scale = transform[0];
const float x = transform[4] / device_scale_factor;
const float y = transform[5] / device_scale_factor;
const float EPS = 3e-5;
const float PAN_EPS = 3e-5;
const float SCALE_EPS = PAN_EPS / PINCH_SCALE_FACTOR;
/* Ignore repeating or incorrect input. */
if ((fabs(scale - last_scale) <= EPS && fabs(x - last_x) <= EPS && fabs(y - last_y) <= EPS) ||
if ((fabs(scale - last_scale) <= SCALE_EPS && fabs(x - last_x) <= PAN_EPS &&
fabs(y - last_y) <= PAN_EPS) ||
scale == 0.0f)
{
GHOST_PRINT("Ignoring touchpad input\n");
@ -307,7 +309,7 @@ HRESULT GHOST_DirectManipulationViewportEventHandler::OnContentUpdated(
/* DM doesn't always immediately recognize pinch gestures,
* so allow transition from pan to pinch. */
if (gesture_state == GESTURE_PAN) {
if (fabs(scale - PINCH_SCALE_FACTOR) > EPS) {
if (fabs(scale - 1.0f) > SCALE_EPS) {
gesture_state = GESTURE_PINCH;
}
}
@ -322,7 +324,17 @@ HRESULT GHOST_DirectManipulationViewportEventHandler::OnContentUpdated(
*/
switch (gesture_state) {
case GESTURE_PINCH: {
int32_t dscale = roundf(scale - last_scale);
/* Map the scale value, so the resulting change value would be equal in both direction.
* This is required for consistent zoom speed when zooming out relative to the starting
* position.
*
* For example, zooming in from 1.0 to 2.0 results in 2.0 change value, and zooming out
* from 1.0 to 0.5 results in -2.0 change value.
*/
float mapped_scale = scale >= 1.0f ? scale : (-1.0f / scale + 2.0f);
mapped_scale *= PINCH_SCALE_FACTOR;
int32_t dscale = roundf(mapped_scale - last_scale);
last_scale += dscale;