[Bf-blender-cvs] [db28e2deb9d] blender2.8: Merge branch 'master' into blender2.8

Brecht Van Lommel noreply at git.blender.org
Sat Jul 8 01:16:23 CEST 2017


Commit: db28e2deb9d154ed50600542e37828867d0148e5
Author: Brecht Van Lommel
Date:   Sat Jul 8 01:02:11 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBdb28e2deb9d154ed50600542e37828867d0148e5

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/screen/screen_edit.c
index c97b52ae1cd,f469686b0b2..3e4b4b501ce
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@@ -923,18 -1228,19 +923,19 @@@ void ED_screen_refresh(wmWindowManager 
  		winrct.ymax = winsize_y - 1;
  		
  		/* header size depends on DPI, let's verify */
+ 		WM_window_set_dpi(win);
  		screen_refresh_headersizes();
  		
 -		screen_test_scale(win->screen, winsize_x, winsize_y);
 +		screen_test_scale(screen, winsize_x, winsize_y);
  		
 -		if (win->screen->mainwin == 0) {
 -			win->screen->mainwin = wm_subwindow_open(win, &winrct, false);
 +		if (screen->mainwin == 0) {
 +			screen->mainwin = wm_subwindow_open(win, &winrct, false);
  		}
  		else {
 -			wm_subwindow_position(win, win->screen->mainwin, &winrct, false);
 +			wm_subwindow_position(win, screen->mainwin, &winrct, false);
  		}
  		
 -		for (sa = win->screen->areabase.first; sa; sa = sa->next) {
 +		for (sa = screen->areabase.first; sa; sa = sa->next) {
  			/* set spacetype and region callbacks, calls init() */
  			/* sets subwindows for regions, adds handlers */
  			ED_area_initialize(wm, win, sa);
diff --cc source/blender/windowmanager/intern/wm_window.c
index 66df41e5b84,8afeb8e7b3d..8068b048d10
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -1005,13 -869,10 +1007,13 @@@ void wm_window_make_drawable(wmWindowMa
  		if (G.debug & G_DEBUG_EVENTS) {
  			printf("%s: set drawable %d\n", __func__, win->winid);
  		}
 +
 +		immDeactivate();
  		GHOST_ActivateWindowDrawingContext(win->ghostwin);
 -		
 +		immActivate();
 +
  		/* this can change per window */
- 		wm_window_set_dpi(win);
+ 		WM_window_set_dpi(win);
  	}
  }
  
@@@ -1208,10 -1069,10 +1210,10 @@@ static int ghost_event_proc(GHOST_Event
  
  				/* stop screencast if resize */
  				if (type == GHOST_kEventWindowSize) {
 -					WM_jobs_stop(wm, win->screen, NULL);
 +					WM_jobs_stop(wm, WM_window_get_active_screen(win), NULL);
  				}
  
- 				wm_window_set_dpi(win);
+ 				WM_window_set_dpi(win);
  				
  				/* win32: gives undefined window size when minimized */
  				if (state != GHOST_kWindowStateMinimized) {
@@@ -1391,11 -1248,9 +1392,11 @@@
  			{
  				// only update if the actual pixel size changes
  				float prev_pixelsize = U.pixelsize;
- 				wm_window_set_dpi(win);
+ 				WM_window_set_dpi(win);
  
  				if (U.pixelsize != prev_pixelsize) {
 +					BKE_icon_changed(WM_window_get_active_screen(win)->id.icon_id);
 +
  					// close all popups since they are positioned with the pixel
  					// size baked in and it's difficult to correct them
  					wmWindow *oldWindow = CTX_wm_window(C);




More information about the Bf-blender-cvs mailing list