Commit: 336ca4e398de3deb3e5dbce97bc0c23bc7e08ad1
Author: Campbell Barton
Date: Tue Jul 29 21:31:10 2014 +1000
Branches: pie-menus
https://developer.blender.org/rB336ca4e398de3deb3e5dbce97bc0c23bc7e08ad1
Use UI_DPI_WINDOW_FAC define
===================================================================
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_layout.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index 6821f65..b998fdb 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -8609,7 +8609,7 @@ static int ui_handler_pie(bContext *C, const wmEvent
*event, uiPopupBlockHandle
uiBut *but;
double final_time = 0.01 *
U.pie_animation_timeout;
float fac = duration / final_time;
- float pie_radius = U.pie_menu_radius * (U.dpi /
72.0f);
+ float pie_radius = U.pie_menu_radius *
UI_DPI_WINDOW_FAC;
if (fac > 1.0f) {
fac = 1.0f;
diff --git a/source/blender/editors/interface/interface_layout.c
b/source/blender/editors/interface/interface_layout.c
index ba08839..7f8e001 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2270,7 +2270,7 @@ static void ui_litem_layout_radial(uiLayout *litem)
* also the old code at http://developer.blender.org/T5103
*/
- int pie_radius = U.pie_menu_radius * (U.dpi / 72.0f);
+ int pie_radius = U.pie_menu_radius * UI_DPI_WINDOW_FAC;
x = litem->x;
y = litem->y;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
