Commit: 863fd8a4fcc1374b292e5ceb5c64f95b7464b3d6
Author: Campbell Barton
Date: Sun Aug 3 04:14:53 2014 +1000
Branches: pie-menus
https://developer.blender.org/rB863fd8a4fcc1374b292e5ceb5c64f95b7464b3d6
rename ui_pie -> ui_(but/block)_pie
===================================================================
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_layout.c
===================================================================
diff --git a/source/blender/editors/interface/interface.c
b/source/blender/editors/interface/interface.c
index be15203..63114d7 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1106,7 +1106,7 @@ const char ui_radial_dir_to_numpad[8] = {8, 9, 6, 3, 2,
1, 4, 7};
const short ui_radial_dir_to_angle_visual[8] = {90, 40, 0, 320, 270, 220, 180,
140};
const short ui_radial_dir_to_angle[8] = {90, 45, 0, 315, 270, 225, 180,
135};
-static void ui_pie_direction_string(uiBut *but, char *buf, int size)
+static void ui_but_pie_direction_string(uiBut *but, char *buf, int size)
{
BLI_assert(but->pie_dir < ARRAY_SIZE(ui_radial_dir_to_numpad));
BLI_snprintf(buf, size, "%d", ui_radial_dir_to_numpad[but->pie_dir]);
@@ -1124,7 +1124,7 @@ static void ui_menu_block_set_keymaps(const bContext *C,
uiBlock *block)
if (block->flag & UI_BLOCK_RADIAL) {
for (but = block->buttons.first; but; but = but->next) {
if (but->pie_dir != UI_RADIAL_NONE) {
- ui_pie_direction_string(but, buf, sizeof(buf));
+ ui_but_pie_direction_string(but, buf,
sizeof(buf));
ui_but_add_shortcut(but, buf, false);
}
}
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index b9eb566..94d550b 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -8465,18 +8465,20 @@ static int ui_handle_menu_return_submenu(bContext *C,
const wmEvent *event, uiPo
}
}
-static bool ui_pie_menu_supported_apply(uiBut *but) {
- if (but->type == NUMSLI)
+static bool ui_but_pie_menu_supported_apply(uiBut *but)
+{
+ if (but->type == NUMSLI) {
return false;
+ }
return true;
}
-static int ui_pie_menu_apply(bContext *C, uiPopupBlockHandle *menu, uiBut
*but, bool force_close, bool click_style)
+static int ui_but_pie_menu_apply(bContext *C, uiPopupBlockHandle *menu, uiBut
*but, bool force_close, bool click_style)
{
int retval = WM_UI_HANDLER_BREAK;
- if (but && ui_pie_menu_supported_apply(but)) {
+ if (but && ui_but_pie_menu_supported_apply(but)) {
if (but->type == MENU) {
/* forcing the pie menu to close will not handle menus
*/
if (!force_close) {
@@ -8519,7 +8521,7 @@ static int ui_pie_menu_apply(bContext *C,
uiPopupBlockHandle *menu, uiBut *but,
return retval;
}
-static uiBut *ui_pie_dir_activate(uiBlock *block, const wmEvent *event,
RadialDirection dir)
+static uiBut *ui_block_pie_dir_activate(uiBlock *block, const wmEvent *event,
RadialDirection dir)
{
uiBut *but;
@@ -8534,7 +8536,7 @@ static uiBut *ui_pie_dir_activate(uiBlock *block, const
wmEvent *event, RadialDi
return NULL;
}
-static int ui_pie_button_activate(bContext *C, uiBut *but, uiPopupBlockHandle
*menu, bool is_click_style)
+static int ui_but_pie_button_activate(bContext *C, uiBut *but,
uiPopupBlockHandle *menu, bool is_click_style)
{
uiBut *active_but;
@@ -8547,7 +8549,7 @@ static int ui_pie_button_activate(bContext *C, uiBut
*but, uiPopupBlockHandle *m
button_activate_exit(C, active_but, active_but->active, false,
false);
button_activate_init(C, menu->region, but, BUTTON_ACTIVATE_OVER);
- return ui_pie_menu_apply(C, menu, but, false, is_click_style);
+ return ui_but_pie_menu_apply(C, menu, but, false, is_click_style);
}
static int ui_handler_pie(bContext *C, const wmEvent *event,
uiPopupBlockHandle *menu)
@@ -8654,7 +8656,7 @@ static int ui_handler_pie(bContext *C, const wmEvent
*event, uiPopupBlockHandle
else if (!is_click_style) {
uiBut *but =
ui_but_find_activated(menu->region);
- retval = ui_pie_menu_apply(C, menu, but, true,
is_click_style);
+ retval = ui_but_pie_menu_apply(C, menu, but,
true, is_click_style);
}
}
}
@@ -8672,7 +8674,7 @@ static int ui_handler_pie(bContext *C, const wmEvent
*event, uiPopupBlockHandle
case LEFTMOUSE:
if (event->val == KM_PRESS) {
uiBut *but =
ui_but_find_activated(menu->region);
- retval = ui_pie_menu_apply(C, menu,
but, false, is_click_style);
+ retval = ui_but_pie_menu_apply(C, menu,
but, false, is_click_style);
}
break;
@@ -8721,7 +8723,7 @@ static int ui_handler_pie(bContext *C, const wmEvent
*event, uiPopupBlockHandle
{
for (but = block->buttons.first; but;
but = but->next) {
if (but->menu_key ==
event->type) {
-
ui_pie_button_activate(C, but, menu, is_click_style);
+
ui_but_pie_button_activate(C, but, menu, is_click_style);
}
}
}
@@ -8741,8 +8743,8 @@ static int ui_handler_pie(bContext *C, const wmEvent
*event, uiPopupBlockHandle
CASE_NUM_TO_DIR(8, UI_RADIAL_N);
CASE_NUM_TO_DIR(9, UI_RADIAL_NE);
{
- but = ui_pie_dir_activate(block, event,
num_dir);
- retval = ui_pie_button_activate(C, but, menu,
is_click_style);
+ but = ui_block_pie_dir_activate(block, event,
num_dir);
+ retval = ui_but_pie_button_activate(C, but,
menu, is_click_style);
break;
}
#undef CASE_NUM_TO_DIR
diff --git a/source/blender/editors/interface/interface_layout.c
b/source/blender/editors/interface/interface_layout.c
index 604942b..7ceccf3 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -885,7 +885,7 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname,
const char *propname
PropertyRNA *prop;
uiBlock *block = layout->root->block;
const bool radial = (layout->item.type == ITEM_LAYOUT_RADIAL) ||
- ((layout->item.type == ITEM_LAYOUT_ROOT) &&
(layout->root->type == UI_LAYOUT_PIEMENU));
+ ((layout->item.type == ITEM_LAYOUT_ROOT) &&
(layout->root->type == UI_LAYOUT_PIEMENU));
if (!ot || !ot->srna) {
ui_item_disabled(layout, opname);
@@ -907,17 +907,20 @@ void uiItemsFullEnumO(uiLayout *layout, const char
*opname, const char *propname
uiLayout *split;
uiLayout *target;
- if (radial)
+ if (radial) {
target = uiLayoutRadial(layout);
+ }
else {
split = uiLayoutSplit(layout, 0.0f, false);
target = uiLayoutColumn(split, layout->align);
}
- if (radial)
+ if (radial) {
RNA_property_enum_items_gettexted_all(block->evil_C,
&ptr, prop, &item_array, NULL, &free);
- else
+ }
+ else {
RNA_property_enum_items_gettexted(block->evil_C, &ptr,
prop, &item_array, NULL, &free);
+ }
for (item = item_array; item->identifier; item++) {
if (item->identifier[0]) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
