[Bf-blender-cvs] [d1057890c40] blender-v2.90-release: Fix incorrect pixelsize use where DPI scale was intended

Campbell Barton noreply at git.blender.org
Tue Aug 18 04:23:56 CEST 2020


Commit: d1057890c40b6f50d0a13215eec90ab1af03a44b
Author: Campbell Barton
Date:   Tue Aug 18 11:53:53 2020 +1000
Branches: blender-v2.90-release
https://developer.blender.org/rBd1057890c40b6f50d0a13215eec90ab1af03a44b

Fix incorrect pixelsize use where DPI scale was intended

Changing line-width shouldn't scale cursor motion. Related to T79787.

Use dpi_fac for scaling curve error threshold & number button drag
threshold calculation.

===================================================================

M	source/blender/editors/curve/editcurve_paint.c
M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c
index 748bf040fbb..ebad1995717 100644
--- a/source/blender/editors/curve/editcurve_paint.c
+++ b/source/blender/editors/curve/editcurve_paint.c
@@ -666,7 +666,7 @@ static void curve_draw_exec_precalc(wmOperator *op)
       selem_prev = selem;
     }
     scale_px = ((len_3d > 0.0f) && (len_2d > 0.0f)) ? (len_3d / len_2d) : 0.0f;
-    float error_threshold = (cps->error_threshold * U.pixelsize) * scale_px;
+    float error_threshold = (cps->error_threshold * U.dpi_fac) * scale_px;
     RNA_property_float_set(op->ptr, prop, error_threshold);
   }
 
@@ -685,7 +685,7 @@ static void curve_draw_exec_precalc(wmOperator *op)
       }
 
       if (len_squared_v2v2(selem_first->mval, selem_last->mval) <=
-          square_f(STROKE_CYCLIC_DIST_PX * U.pixelsize)) {
+          square_f(STROKE_CYCLIC_DIST_PX * U.dpi_fac)) {
         use_cyclic = true;
       }
     }
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index bcb4f7c672f..20d07f97647 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4790,7 +4790,7 @@ static bool ui_numedit_but_NUM(uiBut *but,
 
     if (is_float == false) {
       /* at minimum, moving cursor 2 pixels should change an int button. */
-      CLAMP_MIN(non_linear_scale, 0.5f * U.pixelsize);
+      CLAMP_MIN(non_linear_scale, 0.5f * UI_DPI_FAC);
     }
 
     data->dragf += (((float)(mx - data->draglastx)) / deler) * non_linear_scale;



More information about the Bf-blender-cvs mailing list