diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-26 18:19:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-26 20:45:55 +0300 |
| commit | df02675e21736bd79acb0e34bb410efe748a86bc (patch) | |
| tree | 876e21c395f20fe945bae6a3bfd031a386f2620a /source/blender/editors/space_view3d | |
| parent | c817a89e73891307c2a04e75d0968d49be0e6c29 (diff) | |
UI: move modal operator text from headers to status bar.
Python API is context.workspace.status_text_set()
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_walk.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index d8cc9ab9828..f9fdf8c2cc0 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -333,7 +333,7 @@ static void fly_update_header(bContext *C, wmOperator *op, FlyInfo *fly) #undef WM_MODALKEY - ED_area_headerprint(CTX_wm_area(C), header); + ED_workspace_status_text(C, header); } /* FlyInfo->state */ @@ -1082,7 +1082,7 @@ static int fly_modal(bContext *C, wmOperator *op, const wmEvent *event) } if (ELEM(exit_code, OPERATOR_FINISHED, OPERATOR_CANCELLED)) - ED_area_headerprint(CTX_wm_area(C), NULL); + ED_workspace_status_text(C, NULL); return exit_code; } diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index e001ed9112b..cc951805289 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -811,7 +811,7 @@ static bool view3d_ruler_item_mousemove( } } -static void view3d_ruler_header_update(ScrArea *sa) +static void view3d_ruler_header_update(bContext *C) { const char *text = IFACE_("Ctrl+LMB: Add, " "Del: Remove, " @@ -821,7 +821,7 @@ static void view3d_ruler_header_update(ScrArea *sa) "Enter: Store, " "Esc: Cancel"); - ED_area_headerprint(sa, text); + ED_workspace_status_text(C, text); } /* -------------------------------------------------------------------- */ @@ -847,7 +847,7 @@ static int view3d_ruler_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE ruler_info->draw_handle_pixel = ED_region_draw_cb_activate(ar->type, ruler_info_draw_pixel, ruler_info, REGION_DRAW_POST_PIXEL); - view3d_ruler_header_update(sa); + view3d_ruler_header_update(C); op->flag |= OP_IS_MODAL_CURSOR_REGION; @@ -1079,7 +1079,7 @@ static int view3d_ruler_modal(bContext *C, wmOperator *op, const wmEvent *event) } if (do_draw) { - view3d_ruler_header_update(sa); + view3d_ruler_header_update(C); /* all 3d views draw rulers */ WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL); @@ -1093,7 +1093,7 @@ exit: view3d_ruler_free(ruler_info); op->customdata = NULL; - ED_area_headerprint(sa, NULL); + ED_workspace_status_text(C, NULL); } return exit_code; diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index 352e85703bc..e3e82e8b9c2 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -404,7 +404,7 @@ static void walk_update_header(bContext *C, wmOperator *op, WalkInfo *walk) #undef WM_MODALKEY - ED_area_headerprint(CTX_wm_area(C), header); + ED_workspace_status_text(C, header); } static void walk_navigation_mode_set(bContext *C, wmOperator *op, WalkInfo *walk, eWalkMethod mode) @@ -1436,7 +1436,7 @@ static int walk_modal(bContext *C, wmOperator *op, const wmEvent *event) } if (ELEM(exit_code, OPERATOR_FINISHED, OPERATOR_CANCELLED)) - ED_area_headerprint(CTX_wm_area(C), NULL); + ED_workspace_status_text(C, NULL); return exit_code; } |