diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-11 17:59:57 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-11 17:59:57 +0300 |
| commit | 045306ae499661d585bf989f7b6504caadd2a219 (patch) | |
| tree | ec45884cc835054ae30ce17c24ddae0329f19088 | |
| parent | 3c0c5e04bb15ce03e62a730cc322cf2ade9019ad (diff) | |
2.5
Small fix: Screen state updating should be blocked while menus are open.
Caused draw errors for activated headers. Todo is: bring back separation
between window-handlers and screen-handlers, to solve this?
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 43f80580c74..2039db7ab6e 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -960,6 +960,10 @@ void ED_screen_set_subwinactive(wmWindow *win) 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) @@ -986,10 +990,11 @@ void ED_screen_set_subwinactive(wmWindow *win) if(ar->swinid==oldswin || ar->swinid==win->screen->subwinactive) do_draw= 1; - if(do_draw) + if(do_draw) { for(ar= sa->regionbase.first; ar; ar= ar->next) if(ar->regiontype==RGN_TYPE_HEADER) ar->do_draw= 1; /* XXX */ + } } } } |