[Bf-blender-cvs] [113b053d5b4] blender2.8: WM: add utility function to refresh status bar

[Campbell Barton]

Commit: 113b053d5b4681022679405c4587cf50ba112418
Author: Campbell Barton
Date:   Mon Jul 9 18:13:13 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB113b053d5b4681022679405c4587cf50ba112418

WM: add utility function to refresh status bar

===================================================================

M	source/blender/windowmanager/WM_api.h
M	source/blender/windowmanager/intern/wm_event_system.c

===================================================================

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 1f5e3aa2461..6d577afdbf9 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -608,7 +608,8 @@ bool        WM_event_is_ime_switch(const struct wmEvent *event);
 const char *WM_window_cursor_keymap_status_get(const struct wmWindow *win, int button_index, int type_index);
 void WM_window_cursor_keymap_status_refresh(struct bContext *C, struct wmWindow *win);
 
-struct ScrArea *WM_window_find_area_status(struct wmWindow *win, struct bScreen *sc);
+void WM_window_status_area_tag_redraw(struct wmWindow *win);
+struct ScrArea *WM_window_status_area_find(struct wmWindow *win, struct bScreen *sc);
 bool WM_window_modal_keymap_status_draw(
         struct bContext *C, struct wmWindow *win,
         struct uiLayout *layout);
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 7e2198eed7a..8469dc9da0e 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1973,11 +1973,7 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand
 
 					if (op->type->modalkeymap) {
 						wmWindow *win = CTX_wm_window(C);
-						bScreen *sc = WM_window_get_active_screen(win);
-						ScrArea *sa = WM_window_find_area_status(win, sc);
-						if (sa != NULL) {
-							ED_area_tag_redraw(sa);
-						}
+						WM_window_status_area_tag_redraw(win);
 					}
 				}
 				else {
@@ -3211,11 +3207,7 @@ wmEventHandler *WM_event_add_modal_handler(bContext *C, wmOperator *op)
 	BLI_addhead(&win->modalhandlers, handler);
 
 	if (op->type->modalkeymap) {
-		bScreen *sc = WM_window_get_active_screen(win);
-		ScrArea *sa = WM_window_find_area_status(win, sc);
-		if (sa != NULL) {
-			ED_area_tag_redraw(sa);
-		}
+		WM_window_status_area_tag_redraw(win);
 	}
 
 	return handler;
@@ -4352,7 +4344,7 @@ const char *WM_window_cursor_keymap_status_get(const wmWindow *win, int button_i
  * Similar to #BKE_screen_area_map_find_area_xy and related functions,
  * use here since the ara is stored in the window manager.
  */
-ScrArea *WM_window_find_area_status(wmWindow *win, bScreen *screen)
+ScrArea *WM_window_status_area_find(wmWindow *win, bScreen *screen)
 {
 	if (screen->state == SCREENFULL) {
 		return NULL;
@@ -4367,10 +4359,19 @@ ScrArea *WM_window_find_area_status(wmWindow *win, bScreen *screen)
 	return sa_statusbar;
 }
 
+void WM_window_status_area_tag_redraw(wmWindow *win)
+{
+	bScreen *sc = WM_window_get_active_screen(win);
+	ScrArea *sa = WM_window_status_area_find(win, sc);
+	if (sa != NULL) {
+		ED_area_tag_redraw(sa);
+	}
+}
+
 void WM_window_cursor_keymap_status_refresh(bContext *C, wmWindow *win)
 {
 	bScreen *screen = WM_window_get_active_screen(win);
-	ScrArea *sa_statusbar = WM_window_find_area_status(win, screen);
+	ScrArea *sa_statusbar = WM_window_status_area_find(win, screen);
 	if (sa_statusbar == NULL) {
 		return;
 	}