griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Made View2D drag zoom behave in the same way as zoom in 3d viewport

Browse Source 
Initially issue was caused by opposite MMB-Drag zoom direction in nodes editor.

Made it so MMB-Drag in negative axis direction (down for Y axis and left for
X axis) would zoom in, moving in opposite direction will zoom out.

This could kind of break muscule memory, but after discussion with Campbell
decided it's not so big a problem -- seems users weren't related on direction
of zoom in and just waved mouse around until zoom is correct. And now muscule
memory should even be a bit better -- drag zoom is unified between different
areas.
This commit is contained in:
Sergey Sharybin
2012-09-28 12:01:21 +00:00
parent de1f84783b
commit cd560a1e6a
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -849,12 +849,12 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op)
float mval_faci = 1.0f - mval_fac;
float ofs = (mval_fac * dx) - (mval_faci * dx);
v2d->cur.xmin += ofs + dx;
v2d->cur.xmax += ofs - dx;
v2d->cur.xmin += ofs - dx;
v2d->cur.xmax += ofs + dx;
}
else {
v2d->cur.xmin += dx;
v2d->cur.xmax -= dx;
v2d->cur.xmin -= dx;
v2d->cur.xmax += dx;
}
}
}
@@ -868,12 +868,12 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op)
float mval_faci = 1.0f - mval_fac;
float ofs = (mval_fac * dy) - (mval_faci * dy);
v2d->cur.ymin += ofs + dy;
v2d->cur.ymax += ofs - dy;
v2d->cur.ymin += ofs - dy;
v2d->cur.ymax += ofs + dy;
}
else {
v2d->cur.ymin += dy;
v2d->cur.ymax -= dy;
v2d->cur.ymin -= dy;
v2d->cur.ymax += dy;
}
}
}
@@ -1044,8 +1044,14 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event)
}
/* set transform amount, and add current deltas to stored total delta (for redo) */
RNA_float_set(op->ptr, "deltax", dx);
RNA_float_set(op->ptr, "deltay", dy);
if (U.uiflag & USER_ZOOM_INVERT) {
RNA_float_set(op->ptr, "deltax", -dx);
RNA_float_set(op->ptr, "deltay", -dy);
}
else {
RNA_float_set(op->ptr, "deltax", dx);
RNA_float_set(op->ptr, "deltay", dy);
}
vzd->dx += dx;
vzd->dy += dy;