blender
/
blender
135
403
Fork 585
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

Fix T68360: Zoom too sensitive with hi-dpi 

Scale pixel-input by pixel size for zoom operators.
This commit is contained in:
Campbell Barton 2019-08-08 22:08:10 +10:00
parent 01aae653a1
commit 3504b4c9c3
Notes: blender-bot 2023-02-14 09:43:37 +01:00 
Referenced by issue #68360, Too sensitive zoom in 2d windows on hi-resolution screen
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/view2d_ops.c
View File

@ -940,8 +940,8 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op)
const bool zoom_to_pos = use_cursor_init && (U.uiflag & USER_ZOOM_TO_MOUSEPOS);
/* get amount to move view by */
dx = RNA_float_get(op->ptr, "deltax");
dy = RNA_float_get(op->ptr, "deltay");
dx = RNA_float_get(op->ptr, "deltax") / U.pixelsize;
dy = RNA_float_get(op->ptr, "deltay") / U.pixelsize;
if (U.uiflag & USER_ZOOM_INVERT) {
dx *= -1;

2
source/blender/editors/space_clip/clip_ops.c
View File

@ -640,6 +640,8 @@ static void view_zoom_apply(
delta = event->x - vpd->x + event->y - vpd->y;
}
delta /= U.pixelsize;
if (U.uiflag & USER_ZOOM_INVERT) {
delta = -delta;
}

2
source/blender/editors/space_image/image_ops.c
View File

@ -570,6 +570,8 @@ static void image_zoom_apply(ViewZoomData *vpd,
delta = x - vpd->origx + y - vpd->origy;
}
delta /= U.pixelsize;
if (zoom_invert) {
delta = -delta;
}

18
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -1959,6 +1959,8 @@ static float viewzoom_scale_value(const rcti *winrct,
fac = (float)(xy_init[1] - xy_curr[1]);
}
fac /= U.pixelsize;
if (zoom_invert != zoom_invert_force) {
fac = -fac;
}
@ -1974,8 +1976,8 @@ static float viewzoom_scale_value(const rcti *winrct,
BLI_rcti_cent_x(winrct),
BLI_rcti_cent_y(winrct),
};
float len_new = 5 + len_v2v2_int(ctr, xy_curr);
float len_old = 5 + len_v2v2_int(ctr, xy_init);
float len_new = (5 * U.pixelsize) + ((float)len_v2v2_int(ctr, xy_curr) / U.pixelsize);
float len_old = (5 * U.pixelsize) + ((float)len_v2v2_int(ctr, xy_init) / U.pixelsize);
/* intentionally ignore 'zoom_invert' for scale */
if (zoom_invert_force) {
@ -1985,16 +1987,16 @@ static float viewzoom_scale_value(const rcti *winrct,
zfac = val_orig * (len_old / max_ff(len_new, 1.0f)) / val;
}
else { /* USER_ZOOM_DOLLY */
float len_new = 5;
float len_old = 5;
float len_new = 5 * U.pixelsize;
float len_old = 5 * U.pixelsize;
if (U.uiflag & USER_ZOOM_HORIZ) {
len_new += (winrct->xmax - (xy_curr[0]));
len_old += (winrct->xmax - (xy_init[0]));
len_new += (winrct->xmax - (xy_curr[0])) / U.pixelsize;
len_old += (winrct->xmax - (xy_init[0])) / U.pixelsize;
}
else {
len_new += (winrct->ymax - (xy_curr[1]));
len_old += (winrct->ymax - (xy_init[1]));
len_new += (winrct->ymax - (xy_curr[1])) / U.pixelsize;
len_old += (winrct->ymax - (xy_init[1])) / U.pixelsize;
}
if (zoom_invert != zoom_invert_force) {