diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-03-04 22:30:51 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-04 22:31:40 +0300 |
commit | f33e44151ebc454fef0338b76120dac67a106722 (patch) | |
tree | e7ee4f1e36ec85a48a479de179a242677f74bf99 /source | |
parent | fe7bab13439fe6f0181f6661fbf7bb7ae18f5310 (diff) |
Revert "Fix changing virtual pixelsize having no affect if only main window is open"
This reverts commit fe7bab13439fe6f0181f6661fbf7bb7ae18f5310.
Setting correct context is important,
but this is setting DPI and widget unit on *every* mouse move.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 3 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 657a8a3f514..f4c6fdf42f5 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -148,7 +148,8 @@ static void rna_userdef_virtual_pixel_update(Main *UNUSED(bmain), Scene *UNUSED( { /* font's are stored at each DPI level, without this we can easy load 100's of fonts */ BLF_cache_clear(); - + + BKE_userdef_state(); WM_main_add_notifier(NC_WINDOW, NULL); /* full redraw */ WM_main_add_notifier(NC_SCREEN | NA_EDITED, NULL); /* refresh region sizes */ } diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 572fbac080d..688be21cdd0 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -831,11 +831,11 @@ void wm_window_make_drawable(wmWindowManager *wm, wmWindow *win) printf("%s: set drawable %d\n", __func__, win->winid); } GHOST_ActivateWindowDrawingContext(win->ghostwin); + + /* this can change per window */ + U.pixelsize = wm_window_pixelsize(win); + BKE_userdef_state(); } - - /* this can change per window */ - U.pixelsize = wm_window_pixelsize(win); - BKE_userdef_state(); } /* called by ghost, here we handle events for windows themselves or send to event system */ |