diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-17 18:51:32 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-17 18:51:32 +0300 |
| commit | d6b677ba428c0f09237f1dfcfb2508b296346613 (patch) | |
| tree | 3f58319cc0110d7025f7e8ccacf2c231dc3884be /source/blender | |
| parent | 07d63eb67943e6f9e93443fbbb903436c9b9503d (diff) | |
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).
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 13 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 5 |
2 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index a8cd6b7203c..13c0f545a8a 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1052,7 +1052,7 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen) 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 @@ static void screen_cursor_set(wmWindow *win, wmEvent *event) 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); } } diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 74f3fd33f29..5cc28ec45d8 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -130,11 +130,6 @@ void wm_event_do_notifiers(bContext *C) 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); |