blender
/
blender
134
425
Fork 607
Code Issues 6.3k Pull Requests 773 Projects 19 Wiki Activity

UI: Optional Complex Layout for Workspace Status #120595

Merged
Harley Acheson merged 51 commits from Harley/blender:WorkspaceStatus into main 2024-05-06 23:52:47 +02:00
Conversation 16 Commits 51 Files Changed 13 +75 -43
5 changed files with 75 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a6ffda16ea - Show all commits

10
source/blender/editors/interface/templates/interface_templates.cc
View File

@ -6278,12 +6278,6 @@ void uiTemplateInputStatus(uiLayout *layout, bContext *C)
wmWindow *win = CTX_wm_window(C);
WorkSpace *workspace = CTX_wm_workspace(C);
bool content = false;
/* Automatic keymap status first. */
content = WM_window_modal_keymap_status_draw(C, win, layout);
/* Custom items can be added afterward. */
if (!BLI_listbase_is_empty(&workspace->status)) {
uiLayout *row = uiLayoutRow(layout, true);
LISTBASE_FOREACH (WorkSpaceStatusItem *, item, &workspace->status) {
@ -6294,10 +6288,10 @@ void uiTemplateInputStatus(uiLayout *layout, bContext *C)
uiItemL(row, item->text.c_str(), item->icon);
}
}
content = true;
return;
}
if (content) {
if (WM_window_modal_keymap_status_draw(C, win, layout)) {
return;
}

88
source/blender/editors/mesh/editmesh_knife.cc
View File

@ -1102,51 +1102,75 @@ static void knife_update_header(bContext *C, wmOperator *op, KnifeTool_OpData *k
return WM_modalkeymap_operator_items_to_string(op->type, id, true).value_or("");
};
const std::string header = fmt::format(
IFACE_("{}: confirm, {}: cancel, {}: undo, "
"{}: start/define cut, {}: close cut, {}: new cut, "
"{}: midpoint snap ({}), {}: ignore snap ({}), "
"{}: angle constraint {:.2f}({:.2f}) ({}{}{}{}), {}: cut through ({}), "
"{}: panning, {}{}{}: orientation lock ({}), "
"{}: distance/angle measurements ({}), "
"{}: x-ray ({})"),
get_modal_key_str(KNF_MODAL_CONFIRM),
get_modal_key_str(KNF_MODAL_CANCEL),
get_modal_key_str(KNF_MODAL_UNDO),
get_modal_key_str(KNF_MODAL_ADD_CUT),
get_modal_key_str(KNF_MODAL_ADD_CUT_CLOSED),
get_modal_key_str(KNF_MODAL_NEW_CUT),
get_modal_key_str(KNF_MODAL_MIDPOINT_ON),
WM_bool_as_string(kcd->snap_midpoints),
get_modal_key_str(KNF_MODAL_IGNORE_SNAP_ON),
WM_bool_as_string(kcd->ignore_edge_snapping),
get_modal_key_str(KNF_MODAL_ANGLE_SNAP_TOGGLE),
ED_workspace_status_begin(C);
std::string desc;
ED_workspace_status_keymap(C, TIP_("Cut"), WM_modalkeymap_operator(op->type, KNF_MODAL_ADD_CUT));
ED_workspace_status_keymap(
C, TIP_("Stop"), WM_modalkeymap_operator(op->type, KNF_MODAL_NEW_CUT));
ED_workspace_status_keymap(
C, TIP_("Confirm"), WM_modalkeymap_operator(op->type, KNF_MODAL_CONFIRM));
ED_workspace_status_keymap(
C, TIP_("Cancel"), WM_modalkeymap_operator(op->type, KNF_MODAL_CANCEL));
ED_workspace_status_keymap(C, TIP_("Undo"), WM_modalkeymap_operator(op->type, KNF_MODAL_UNDO));
ED_workspace_status_keymap(C, "Pan View", WM_modalkeymap_operator(op->type, KNF_MODAL_PANNING));
desc = IFACE_("Midpoint Snap: ");
desc += WM_bool_as_string(kcd->snap_midpoints);
ED_workspace_status_keymap(C, desc, WM_modalkeymap_operator(op->type, KNF_MODAL_MIDPOINT_ON));
desc = IFACE_("Ignore Snap: ");
desc += WM_bool_as_string(kcd->ignore_edge_snapping);
ED_workspace_status_keymap(C, desc, WM_modalkeymap_operator(op->type, KNF_MODAL_IGNORE_SNAP_ON));
const std::string angle = fmt::format(
"{}: {:.2f}({:.2f}) ({}{}{}{})",
IFACE_("Angle Constraint"),
(kcd->angle >= 0.0f) ? RAD2DEGF(kcd->angle) : 360.0f + RAD2DEGF(kcd->angle),
(kcd->angle_snapping_increment > KNIFE_MIN_ANGLE_SNAPPING_INCREMENT &&
kcd->angle_snapping_increment <= KNIFE_MAX_ANGLE_SNAPPING_INCREMENT) ?
kcd->angle_snapping_increment :
KNIFE_DEFAULT_ANGLE_SNAPPING_INCREMENT,
kcd->angle_snapping ?
((kcd->angle_snapping_mode == KNF_CONSTRAIN_ANGLE_MODE_SCREEN) ? "Screen" : "Relative") :
"OFF", /* TODO: Can this be simplified? */
(kcd->angle_snapping_mode == KNF_CONSTRAIN_ANGLE_MODE_RELATIVE) ? " - " : "",
(kcd->angle_snapping_mode == KNF_CONSTRAIN_ANGLE_MODE_RELATIVE) ?
get_modal_key_str(KNF_MODAL_CYCLE_ANGLE_SNAP_EDGE) :
"",
(kcd->angle_snapping_mode == KNF_CONSTRAIN_ANGLE_MODE_RELATIVE) ? ": cycle edge" : "", /**/
get_modal_key_str(KNF_MODAL_CUT_THROUGH_TOGGLE),
WM_bool_as_string(kcd->cut_through),
get_modal_key_str(KNF_MODAL_PANNING),
get_modal_key_str(KNF_MODAL_X_AXIS),
get_modal_key_str(KNF_MODAL_Y_AXIS),
get_modal_key_str(KNF_MODAL_Z_AXIS),
(kcd->axis_constrained ? kcd->axis_string : WM_bool_as_string(kcd->axis_constrained)),
get_modal_key_str(KNF_MODAL_SHOW_DISTANCE_ANGLE_TOGGLE),
WM_bool_as_string(kcd->show_dist_angle),
get_modal_key_str(KNF_MODAL_DEPTH_TEST_TOGGLE),
WM_bool_as_string(!kcd->depth_test));
(kcd->angle_snapping_mode == KNF_CONSTRAIN_ANGLE_MODE_RELATIVE) ? ": cycle edge" : "");
ED_workspace_status_text(C, header.c_str());
ED_workspace_status_keymap(
C, angle, WM_modalkeymap_operator(op->type, KNF_MODAL_ANGLE_SNAP_TOGGLE));
desc = IFACE_("Cut Through: ");
desc += WM_bool_as_string(kcd->cut_through);
ED_workspace_status_keymap(
C, desc, WM_modalkeymap_operator(op->type, KNF_MODAL_CUT_THROUGH_TOGGLE));
ED_workspace_status_keymap(C, "", WM_modalkeymap_operator(op->type, KNF_MODAL_X_AXIS));
ED_workspace_status_keymap(C, "", WM_modalkeymap_operator(op->type, KNF_MODAL_Y_AXIS));
ED_workspace_status_keymap(C, "", WM_modalkeymap_operator(op->type, KNF_MODAL_Z_AXIS));
desc = IFACE_("Axis: ");
desc += kcd->axis_constrained ? kcd->axis_string : WM_bool_as_string(kcd->axis_constrained);
ED_workspace_status_item(C, desc);
desc = IFACE_("Measure: ");
desc += WM_bool_as_string(kcd->show_dist_angle);
ED_workspace_status_keymap(
C, desc, WM_modalkeymap_operator(op->type, KNF_MODAL_SHOW_DISTANCE_ANGLE_TOGGLE));
desc = IFACE_("X-ray: ");
desc += WM_bool_as_string(!kcd->depth_test);
ED_workspace_status_keymap(
C, desc, WM_modalkeymap_operator(op->type, KNF_MODAL_DEPTH_TEST_TOGGLE));
ED_workspace_status_end(C);
}
/** \} */

8
source/blender/editors/screen/area.cc
View File

@ -938,9 +938,11 @@ void ED_workspace_status_key(bContext *C,
ED_workspace_status_item(C, {}, ICON_EVENT_OS);
}
ED_workspace_status_item(C, {}, icon);
ED_workspace_status_space(C, 0.6f);
ED_workspace_status_item(C, text, ICON_NONE);
ED_workspace_status_space(C, 0.7f);
if (!text.empty()) {
ED_workspace_status_space(C, 0.6f);
ED_workspace_status_item(C, text, ICON_NONE);
ED_workspace_status_space(C, 0.7f);
}
}
void ED_workspace_status_keymap(bContext *C, const std::string text, const wmKeyMapItem *kmi)

2
source/blender/windowmanager/WM_keymap.hh
View File

@ -144,6 +144,8 @@ std::optional<std::string> WM_modalkeymap_operator_items_to_string(wmOperatorTyp
int propvalue,
bool compact);
const wmKeyMapItem *WM_modalkeymap_operator(wmOperatorType *ot, const int propvalue);
wmKeyMap *WM_modalkeymap_ensure(wmKeyConfig *keyconf,
const char *idname,
const EnumPropertyItem *items);

10
source/blender/windowmanager/intern/wm_keymap.cc
View File

@ -1288,6 +1288,16 @@ std::optional<std::string> WM_modalkeymap_operator_items_to_string(wmOperatorTyp
return WM_modalkeymap_items_to_string(keymap, propvalue, compact);
}
const wmKeyMapItem *WM_modalkeymap_operator(wmOperatorType *ot, const int propvalue)
{
wmWindowManager *wm = static_cast<wmWindowManager *>(G_MAIN->wm.first);
wmKeyMap *keymap = WM_keymap_active(wm, ot->modalkeymap);
if (keymap) {
return WM_modalkeymap_find_propvalue(keymap, propvalue);
}
return nullptr;
}
/** \} */
/* -------------------------------------------------------------------- */