archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: fix incorrect scaling of manipulator widgets with DPI.

Browse Source 
U.ui_scale is the setting from the user preferences and should never be used
for drawing. UI_DPI_FAC is the final scale after DPI from the operating system
is taken into account.
This commit is contained in:
Brecht Van Lommel
2018-04-28 16:00:41 +02:00
parent 61759f3b55
commit bf75b24818
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/windowmanager/manipulators/intern/wm_manipulator.c
View File

@@ -53,6 +53,8 @@
#include "ED_screen.h"
#include "ED_view3d.h"
#include "UI_interface.h"
#ifdef WITH_PYTHON
#include "BPY_extern.h"
#endif
@@ -470,7 +472,7 @@ bool wm_manipulator_select_and_highlight(bContext *C, wmManipulatorMap *mmap, wm
void wm_manipulator_calculate_scale(wmManipulator *mpr, const bContext *C)
{
const RegionView3D *rv3d = CTX_wm_region_view3d(C);
float scale = U.ui_scale;
float scale = UI_DPI_FAC;
if ((mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_SCALE) == 0) {
scale *= U.manipulator_size;