[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17859] branches/blender2.5/blender/source /blender: 2.5

[Ton Roosendaal]

Revision: 17859
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17859
Author:   ton
Date:     2008-12-14 20:04:20 +0100 (Sun, 14 Dec 2008)

Log Message:
-----------
2.5

Small fix: in the ghost part of WM event handling, a function was
setting 'active subwindow' and registering headers to be drawn active
for this or not. It should be nicely inside the handler queue, so
it doesnt get executed on modal window-handlers. 

(This solves flashing area headers while dragging area edges)

Still needed to resolve how screen handling goes... via handlers
with operators? On my list to keep track of. :)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
    branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c	2008-12-14 18:39:58 UTC (rev 17858)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c	2008-12-14 19:04:20 UTC (rev 17859)
@@ -1026,10 +1026,6 @@
 		ScrArea *sa;
 		int oldswin= win->screen->subwinactive;
 		
-		/* XXX prevent this call for modal menus now */
-		if(win->screen->regionbase.first)
-			return;
-		
 		for(sa= win->screen->areabase.first; sa; sa= sa->next) {
 			if(event->x > sa->totrct.xmin && event->x < sa->totrct.xmax)
 				if(event->y > sa->totrct.ymin && event->y < sa->totrct.ymax)

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2008-12-14 18:39:58 UTC (rev 17858)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2008-12-14 19:04:20 UTC (rev 17859)
@@ -277,7 +277,6 @@
 		} else {
 			WM_set_cursor(C, CURSOR_X_MOVE);
 		}
-		return OPERATOR_FINISHED;
 	} 
 	else {
 		ScrArea *sa= NULL;

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c	2008-12-14 18:39:58 UTC (rev 17858)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c	2008-12-14 19:04:20 UTC (rev 17859)
@@ -635,14 +635,16 @@
 			
 			/* MVC demands to not draw in event handlers... for now we leave it */
 			wm_window_make_drawable(C, win);
-				
+			
 			action= wm_handlers_do(C, event, &win->handlers);
 			
 			if(wm_event_always_pass(event) || action==WM_HANDLER_CONTINUE) {
 				ScrArea *sa;
 				ARegion *ar;
 				int doit= 0;
-
+				
+				ED_screen_set_subwinactive(win);	/* state variables in screen */
+				
 				for(sa= win->screen->areabase.first; sa; sa= sa->next) {
 					if(wm_event_always_pass(event) || wm_event_prev_inside_i(event, &sa->totrct)) {
 						doit= 1;
@@ -896,8 +898,6 @@
 				event.x= evt->x= cx;
 				event.y= evt->y= (win->sizey-1) - cy;
 				
-				ED_screen_set_subwinactive(win);	/* state variables in screen */
-				
 				update_tablet_data(win, &event);
 				wm_event_add(win, &event);
 			}