diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-10-12 21:15:38 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-19 15:26:41 +0300 |
commit | 97bba76e8c8efa0da8221f6e1822d9f29d70bff0 (patch) | |
tree | bcbd0a80198142dc2c11ebd4f53bb00f1bd38e57 | |
parent | 10598c084e1b4a0d655088fb3115cae93559889e (diff) |
Fix T49631: radial control operators not using DPI properly.
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 2c2952131d7..a2128864e6f 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2862,8 +2862,8 @@ void WM_OT_straightline_gesture(wmOperatorType *ot) /* *********************** radial control ****************** */ -#define WM_RADIAL_CONTROL_DISPLAY_SIZE (200) -#define WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE (35) +#define WM_RADIAL_CONTROL_DISPLAY_SIZE (200 * UI_DPI_FAC) +#define WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE (35 * UI_DPI_FAC) #define WM_RADIAL_CONTROL_DISPLAY_WIDTH (WM_RADIAL_CONTROL_DISPLAY_SIZE - WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE) #define WM_RADIAL_MAX_STR 10 @@ -3140,7 +3140,7 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd if (rmin > 0.0f) glutil_draw_lined_arc(0.0, (float)(M_PI * 2.0), rmin, 40); - BLF_size(fontid, 1.5 * fstyle_points, 1.0f / U.dpi); + BLF_size(fontid, 1.5 * fstyle_points * U.pixelsize, U.dpi); BLF_enable(fontid, BLF_SHADOW); BLF_shadow(fontid, 3, (const float[4]){0.0f, 0.0f, 0.0f, 0.5f}); BLF_shadow_offset(fontid, 1, -1); |