griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Status Bar Merge Proportional Size Keymap Entries

Browse Source 
This PR reduces some space on the Status bar during transforms using
proportional editing by merging TFM_MODAL_PROPSIZE_UP and
TFM_MODAL_PROPSIZE_DOWN items. This also changes the description shown
to "Proportional Size" to match the description in the popover.

Pull Request: https://projects.blender.org/blender/blender/pulls/138458
This commit is contained in:
Harley Acheson
2025-05-07 19:33:59 +02:00
committed by Harley Acheson
parent f90e448c6a
commit 1c2aaa8a57
1 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/blender/editors/interface/templates/interface_template_event.cc
View File

@@ -54,7 +54,7 @@ int uiTemplateStatusBarModalItem(uiLayout *layout,
return 1;
}
/* Try to merge some known XYZ items to save horizontal space. */
/* Try to merge some known triplet items to save horizontal space. */
const EnumPropertyItem *item_y = (item[1].identifier) ? item + 1 : nullptr;
const EnumPropertyItem *item_z = (item_y && item[2].identifier) ? item + 2 : nullptr;
const wmKeyMapItem *kmi_y = keymap_item_from_enum_item(keymap, item_y);
@@ -91,25 +91,65 @@ int uiTemplateStatusBarModalItem(uiLayout *layout,
}
}
uiItemL(layout, "", icon);
uiItemS_ex(layout, -0.4f);
uiItemS_ex(layout, ui_event_icon_offset(icon));
#ifndef WITH_HEADLESS
icon = UI_icon_from_keymap_item(kmi_y, icon_mod);
#endif
uiItemL(layout, "", icon);
uiItemS_ex(layout, -0.4f);
uiItemS_ex(layout, ui_event_icon_offset(icon));
#ifndef WITH_HEADLESS
icon = UI_icon_from_keymap_item(kmi_z, icon_mod);
#endif
uiItemL(layout, "", icon);
uiItemS_ex(layout, -0.18f);
uiItemS_ex(layout, ui_event_icon_offset(icon));
uiItemS_ex(layout, 0.2f);
uiItemL(layout, xyz_label, ICON_NONE);
uiItemS_ex(layout, 0.6f);
return 3;
}
}
/* Try to merge some known paired items to save horizontal space. */
if (kmi_y && keymap_item_can_collapse(kmi, kmi_y)) {
const char *ab_label = nullptr;
if (STREQ(item->identifier, "PROPORTIONAL_SIZE_UP") &&
STREQ(item_y->identifier, "PROPORTIONAL_SIZE_DOWN"))
{
ab_label = IFACE_("Proportional Size");
}
if (ab_label) {
int icon_mod[KM_MOD_NUM] = {0};
#ifdef WITH_HEADLESS
int icon = 0;
#else
int icon = UI_icon_from_keymap_item(kmi, icon_mod);
#endif
for (int j = 0; j < ARRAY_SIZE(icon_mod) && icon_mod[j]; j++) {
uiItemL(layout, "", icon_mod[j]);
const float offset = ui_event_icon_offset(icon_mod[j]);
if (offset != 0.0f) {
uiItemS_ex(layout, offset);
}
}
uiItemL(layout, "", icon);
uiItemS_ex(layout, ui_event_icon_offset(icon));
#ifndef WITH_HEADLESS
icon = UI_icon_from_keymap_item(kmi_y, icon_mod);
#endif
uiItemL(layout, "", icon);
uiItemS_ex(layout, ui_event_icon_offset(icon));
uiItemS_ex(layout, 0.2f);
uiItemL(layout, ab_label, ICON_NONE);
uiItemS_ex(layout, 0.6f);
return 2;
}
}
/* Single item without merging. */
return uiTemplateEventFromKeymapItem(layout, item->name, kmi, false) ? 1 : 0;
}