diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-20 11:16:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-20 11:16:01 +0300 |
| commit | d8bf0900902b2b523bb50a69b9c669c7d5797d72 (patch) | |
| tree | e9c35670312b11b2af91eed605d68bb1e2f4a66b /source/blender/editors/screen | |
| parent | 462d9e37ea4d4f9aa5344b4a49d9aa95f7692a10 (diff) | |
| parent | 6da53e46c9dc81fcbabd49d1db0f88c5e876cf43 (diff) | |
Merge branch 'master' into 28
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 4ba3a534b49..69d13beee48 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3888,22 +3888,11 @@ static void SCREEN_OT_back_to_previous(struct wmOperatorType *ot) static int userpref_show_invoke(bContext *C, wmOperator *op, const wmEvent *event) { - wmWindow *win = CTX_wm_window(C); - rcti rect; - int sizex, sizey; - - sizex = 800 * UI_DPI_WINDOW_FAC; - sizey = 480 * UI_DPI_WINDOW_FAC; - - /* some magic to calculate postition */ - /* pixelsize: mouse coords are in U.pixelsize units :/ */ - rect.xmin = (event->x / U.pixelsize) + win->posx - sizex / 2; - rect.ymin = (event->y / U.pixelsize) + win->posy - sizey / 2; - rect.xmax = rect.xmin + sizex; - rect.ymax = rect.ymin + sizey; + int sizex = 800 * UI_DPI_FAC; + int sizey = 480 * UI_DPI_FAC; /* changes context! */ - if (WM_window_open_temp(C, &rect, WM_WINDOW_USERPREFS) != NULL) { + if (WM_window_open_temp(C, event->x, event->y, sizex, sizey, WM_WINDOW_USERPREFS) != NULL) { return OPERATOR_FINISHED; } else { |