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

Ton Roosendaal ton at blender.org
Wed Dec 17 16:51:32 CET 2008


Revision: 17907
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17907
Author:   ton
Date:     2008-12-17 16:51:32 +0100 (Wed, 17 Dec 2008)

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

Small commit, too much fun to not do separately:

- removed notifier restriction to go only to own window, so multiwindow
  setups redraw correctly. (when other windows show other scenes we have
  to handle still).
- fixed cursor type outside of window (got stuck to area-move cursor).

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/screen_edit.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-17 15:38:40 UTC (rev 17906)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c	2008-12-17 15:51:32 UTC (rev 17907)
@@ -1052,7 +1052,7 @@
 	C->window= prevwin;
 }
 
-/* case when on area-edge or in azones */
+/* case when on area-edge or in azones, or outside window */
 static void screen_cursor_set(wmWindow *win, wmEvent *event)
 {
 	ScrArea *sa;
@@ -1067,11 +1067,14 @@
 	else {
 		ScrEdge *actedge= screen_find_active_scredge(win->screen, event->x, event->y);
 		
-		if (actedge && scredge_is_horizontal(actedge)) {
-			WM_cursor_set(win, CURSOR_Y_MOVE);
-		} else {
-			WM_cursor_set(win, CURSOR_X_MOVE);
+		if (actedge) {
+			if(scredge_is_horizontal(actedge))
+				WM_cursor_set(win, CURSOR_Y_MOVE);
+			else
+				WM_cursor_set(win, CURSOR_X_MOVE);
 		}
+		else
+			WM_cursor_set(win, CURSOR_STD);
 	} 
 }
 

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-17 15:38:40 UTC (rev 17906)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c	2008-12-17 15:51:32 UTC (rev 17907)
@@ -130,11 +130,6 @@
 
 			C->window= win;
 			C->screen= win->screen;	/* XXX context in notifiers? */
-			
-			if(note->window && note->window!=win)
-				continue;
-			if(win->screen==NULL)
-				continue;
 
 			/* printf("notifier win %d screen %s\n", win->winid, win->screen->id.name+2); */
 			ED_screen_do_listen(win, note);





More information about the Bf-blender-cvs mailing list