diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_tooltip.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_tooltip.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_tooltip.c b/source/blender/windowmanager/intern/wm_tooltip.c index 0d02b4fc4e3..94a44a97afd 100644 --- a/source/blender/windowmanager/intern/wm_tooltip.c +++ b/source/blender/windowmanager/intern/wm_tooltip.c @@ -41,7 +41,9 @@ void WM_tooltip_timer_init( bContext *C, wmWindow *win, ARegion *ar, wmTooltipInitFn init) { - bScreen *screen = win->screen; + WM_tooltip_timer_clear(C, win); + + bScreen *screen = WM_window_get_active_screen(win); wmWindowManager *wm = CTX_wm_manager(C); if (screen->tool_tip == NULL) { screen->tool_tip = MEM_callocN(sizeof(*screen->tool_tip), __func__); @@ -54,7 +56,7 @@ void WM_tooltip_timer_init( void WM_tooltip_timer_clear(bContext *C, wmWindow *win) { wmWindowManager *wm = CTX_wm_manager(C); - bScreen *screen = win->screen; + bScreen *screen = WM_window_get_active_screen(win); if (screen->tool_tip != NULL) { if (screen->tool_tip->timer != NULL) { WM_event_remove_timer(wm, win, screen->tool_tip->timer); @@ -66,7 +68,7 @@ void WM_tooltip_timer_clear(bContext *C, wmWindow *win) void WM_tooltip_clear(bContext *C, wmWindow *win) { WM_tooltip_timer_clear(C, win); - bScreen *screen = win->screen; + bScreen *screen = WM_window_get_active_screen(win); if (screen->tool_tip != NULL) { if (screen->tool_tip->region) { UI_tooltip_free(C, screen, screen->tool_tip->region); @@ -80,7 +82,7 @@ void WM_tooltip_clear(bContext *C, wmWindow *win) void WM_tooltip_init(bContext *C, wmWindow *win) { WM_tooltip_timer_clear(C, win); - bScreen *screen = win->screen; + bScreen *screen = WM_window_get_active_screen(win); if (screen->tool_tip->region) { UI_tooltip_free(C, screen, screen->tool_tip->region); screen->tool_tip->region = NULL; @@ -95,7 +97,7 @@ void WM_tooltip_init(bContext *C, wmWindow *win) void WM_tooltip_refresh(bContext *C, wmWindow *win) { WM_tooltip_timer_clear(C, win); - bScreen *screen = win->screen; + bScreen *screen = WM_window_get_active_screen(win); if (screen->tool_tip != NULL) { if (screen->tool_tip->region) { UI_tooltip_free(C, screen, screen->tool_tip->region); |