diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-08-30 11:11:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-30 11:11:07 +0400 |
| commit | ec76d47a48b5091e4c25ea95d815602d860760fc (patch) | |
| tree | 7447574b9bb4b2118b24da15ae3a79f9d8cd4262 /source/blender/editors/interface/interface_handlers.c | |
| parent | 526ae635d191d0245fc2c0923130ed968891d6a0 (diff) | |
Use UI_BUT_ prefix as other flags do
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 2d919a2afc1..05305e2e5cd 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6714,10 +6714,13 @@ static void button_tooltip_timer_reset(bContext *C, uiBut *but) data->tooltiptimer = NULL; } - if ((U.flag & USER_TOOLTIPS) || (but->flag & UI_OPTION_TOOLTIPS)) - if (!but->block->tooltipdisabled) - if (!wm->drags.first) + if ((U.flag & USER_TOOLTIPS) || (but->flag & UI_BUT_TIP_FORCE)) { + if (!but->block->tooltipdisabled) { + if (!wm->drags.first) { data->tooltiptimer = WM_event_add_timer(data->wm, data->window, TIMER, BUTTON_TOOLTIP_DELAY); + } + } + } } static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState state) @@ -7226,11 +7229,13 @@ static int ui_handle_button_over(bContext *C, const wmEvent *event, ARegion *ar) if (event->type == MOUSEMOVE) { but = ui_but_find_mouse_over(ar, event); if (but) { - if (event->alt) + if (event->alt) { /* display tooltips if holding alt on mouseover when tooltips are off in prefs */ - but->flag |= UI_OPTION_TOOLTIPS; - else - but->flag &= ~UI_OPTION_TOOLTIPS; + but->flag |= UI_BUT_TIP_FORCE; + } + else { + but->flag &= ~UI_BUT_TIP_FORCE; + } button_activate_init(C, ar, but, BUTTON_ACTIVATE_OVER); } } |