diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-03-10 14:11:26 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-03-10 14:11:26 +0300 |
| commit | 476eadbcb12ca26afe0f535c5e359759d3684cf0 (patch) | |
| tree | 97a3b6c3b91d548033c7c43fe819996b0f3562aa /source/blender/editors/interface | |
| parent | 0e74ed595210373beb4d3c4beb48d99756ff0ca4 (diff) | |
Bugfix #26437
- Tooltip-hanging fix made the 'active' button be removed when mouse
enters another subwindow. Caused by commit of a week ago.
- Reverted the eventsystem change that sets 'active subwindow' before
it calls modal handlers. This made editors become active on using
menus, buttons, or other modal ops.
Side effect is that for transform operators called via toolbar, the
overlay-extra draw with helplines now gets skipped. Will check on
good ways for it.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 7c3cb006225..91380d20f41 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -4608,7 +4608,8 @@ void uiFreeActiveButtons(const bContext *C, bScreen *screen) uiHandleButtonData *data= but->active; if(data->menu==NULL && data->searchbox==NULL) - ui_button_active_free(C, but); + if(data->state == BUTTON_STATE_HIGHLIGHT) + ui_button_active_free(C, but); } } } |