archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-01-25 22:20:27 +11:00
parent fd4d7fbf13 2d46ea52cd
commit 5836293990
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_handlers.c
View File

@@ -7720,7 +7720,9 @@ void UI_but_tooltip_timer_remove(bContext *C, uiBut *but)
data->autoopentimer = NULL;
}
WM_tooltip_clear(C, data->window);
if (data->window) {
WM_tooltip_clear(C, data->window);
}
}
}

10
source/blender/windowmanager/WM_types.h
View File

@@ -702,12 +702,20 @@ typedef struct wmDropBox {
} wmDropBox;
/**
* Struct to store tool-tip timer and possible creation if the time is reached.
* Allows UI code to call #WM_tooltip_timer_init without each user having to handle the timer.
*/
typedef struct wmTooltipState {
/** Create tooltip on this event. */
struct wmTimer *timer;
/** The region the tooltip is created in. */
struct ARegion *region_from;
/** The tooltip region. */
struct ARegion *region;
/** Create the tooltip region (assign to 'region'). */
struct ARegion *(*init)(struct bContext *, struct ARegion *, bool *r_exit_on_event);
/* Exit on any event, not needed for buttons since their highlight state is used. */
/** Exit on any event, not needed for buttons since their highlight state is used. */
bool exit_on_event;
} wmTooltipState;