diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-11-23 00:03:35 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-11-23 00:03:35 +0300 |
| commit | 5df55e184ec2965af9387519e3051ab109a27437 (patch) | |
| tree | fc5acd02e57f4d11cf518fe6b523c45631748a40 /source/blender/editors/interface/interface_widgets.c | |
| parent | 76a18d555ce6a2af319b40a8131845f9123f7d31 (diff) | |
| parent | 3fb77591f4d7cd31cfc4410b18d9d5e9ad135394 (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into collada2.8
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index ea588c703c6..0ffc40bdf9d 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -4566,8 +4566,8 @@ void ui_draw_pie_center(uiBlock *block) float *pie_dir = block->pie_data.pie_dir; - float pie_radius_internal = U.pixelsize * U.pie_menu_threshold; - float pie_radius_external = U.pixelsize * (U.pie_menu_threshold + 7.0f); + float pie_radius_internal = U.dpi_fac * U.pie_menu_threshold; + float pie_radius_external = U.dpi_fac * (U.pie_menu_threshold + 7.0f); int subd = 40; @@ -4609,8 +4609,8 @@ void ui_draw_pie_center(uiBlock *block) immUnbindProgram(); if (U.pie_menu_confirm > 0 && !(block->pie_data.flags & (UI_PIE_INVALID_DIR | UI_PIE_CLICK_STYLE))) { - float pie_confirm_radius = U.pixelsize * (pie_radius_internal + U.pie_menu_confirm); - float pie_confirm_external = U.pixelsize * (pie_radius_internal + U.pie_menu_confirm + 7.0f); + float pie_confirm_radius = U.dpi_fac * (pie_radius_internal + U.pie_menu_confirm); + float pie_confirm_external = U.dpi_fac * (pie_radius_internal + U.pie_menu_confirm + 7.0f); const char col[4] = {btheme->tui.wcol_pie_menu.text_sel[0], btheme->tui.wcol_pie_menu.text_sel[1], |