diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-04-20 01:17:42 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-04-20 02:19:47 +0300 |
commit | 6c26911c3df6b02a0ee19899e71207f372b718b3 (patch) | |
tree | d33d30f221af3de6eff6abebbf46afb2aea660e9 /source/blender/editors/render/render_view.c | |
parent | 1873ea337c24e7a169c306a7467ce899a53eb0f8 (diff) |
Fix T51248: user preferences window size not adapted to DPI.
Diffstat (limited to 'source/blender/editors/render/render_view.c')
-rw-r--r-- | source/blender/editors/render/render_view.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index 65f0fec50bc..c4a9af79ec2 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -44,6 +44,7 @@ #include "WM_types.h" #include "ED_screen.h" +#include "UI_interface.h" #include "wm_window.h" @@ -128,8 +129,8 @@ static ScrArea *find_area_image_empty(bContext *C) /* new window uses x,y to set position */ ScrArea *render_view_open(bContext *C, int mx, int my, ReportList *reports) { - wmWindow *win = CTX_wm_window(C); Scene *scene = CTX_data_scene(C); + wmWindow *win = NULL; ScrArea *sa = NULL; SpaceImage *sima; bool area_was_image = false; @@ -138,25 +139,15 @@ ScrArea *render_view_open(bContext *C, int mx, int my, ReportList *reports) return NULL; if (scene->r.displaymode == R_OUTPUT_WINDOW) { - rcti rect; - int sizex, sizey; - - sizex = 10 + (scene->r.xsch * scene->r.size) / 100; - sizey = 40 + (scene->r.ysch * scene->r.size) / 100; + int sizex = 30 * UI_DPI_FAC + (scene->r.xsch * scene->r.size) / 100; + int sizey = 60 * UI_DPI_FAC + (scene->r.ysch * scene->r.size) / 100; /* arbitrary... miniature image window views don't make much sense */ if (sizex < 320) sizex = 320; if (sizey < 256) sizey = 256; - /* some magic to calculate postition */ - /* pixelsize: mouse coords are in U.pixelsize units :/ */ - rect.xmin = (mx / U.pixelsize) + win->posx - sizex / 2; - rect.ymin = (my / U.pixelsize) + win->posy - sizey / 2; - rect.xmax = rect.xmin + sizex; - rect.ymax = rect.ymin + sizey; - /* changes context! */ - if (WM_window_open_temp(C, &rect, WM_WINDOW_RENDER) == NULL) { + if (WM_window_open_temp(C, mx, my, sizex, sizey, WM_WINDOW_RENDER) == NULL) { BKE_report(reports, RPT_ERROR, "Failed to open window!"); return NULL; } |