Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2018-04-23 10:00:42 +02:00
parent 3aa75ba452
commit fc1374c01b
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/interface/interface_region_menu_popup.c
View File

@@ -136,9 +136,11 @@ static uiBut *ui_popup_menu_memory__internal(uiBlock *block, uiBut *but)
} }
else { else {
/* get */ /* get */
for (but = block->buttons.first; but; but = but->next) for (but = block->buttons.first; but; but = but->next) {
if (ui_popup_string_hash(but->str) == mem[hash_mod]) if (ui_popup_string_hash(but->str) == mem[hash_mod]) {
return but; return but;
}
}
return NULL; return NULL;
} }
@@ -176,9 +178,8 @@ struct uiPopupMenu {
static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, void *arg_pup) static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, void *arg_pup)
{ {
uiBlock *block; uiBlock *block;
uiBut *bt;
uiPopupMenu *pup = arg_pup; uiPopupMenu *pup = arg_pup;
int offset[2], minwidth, width, height; int minwidth, width, height;
char direction; char direction;
bool flip; bool flip;
@@ -218,8 +219,9 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
/* in some cases we create the block before the region, /* in some cases we create the block before the region,
* so we set it delayed here if necessary */ * so we set it delayed here if necessary */
if (BLI_findindex(&handle->region->uiblocks, block) == -1) if (BLI_findindex(&handle->region->uiblocks, block) == -1) {
UI_block_region_set(block, handle->region); UI_block_region_set(block, handle->region);
}
block->direction = direction; block->direction = direction;
@@ -228,6 +230,9 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
UI_block_flag_enable(block, UI_BLOCK_MOVEMOUSE_QUIT); UI_block_flag_enable(block, UI_BLOCK_MOVEMOUSE_QUIT);
if (pup->popup) { if (pup->popup) {
uiBut *bt;
int offset[2];
uiBut *but_activate = NULL; uiBut *but_activate = NULL;
UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_NUMSELECT); UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_NUMSELECT);
UI_block_direction_set(block, direction); UI_block_direction_set(block, direction);
@@ -251,8 +256,9 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
/* position mouse at 0.8*width of the button and below the tile /* position mouse at 0.8*width of the button and below the tile
* on the first item */ * on the first item */
offset[0] = 0; offset[0] = 0;
for (bt = block->buttons.first; bt; bt = bt->next) for (bt = block->buttons.first; bt; bt = bt->next) {
offset[0] = min_ii(offset[0], -(bt->rect.xmin + 0.8f * BLI_rctf_size_x(&bt->rect))); offset[0] = min_ii(offset[0], -(bt->rect.xmin + 0.8f * BLI_rctf_size_x(&bt->rect)));
}
offset[1] = 2.1 * UI_UNIT_Y; offset[1] = 2.1 * UI_UNIT_Y;
@@ -292,8 +298,9 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
} }
/* if menu slides out of other menu, override direction */ /* if menu slides out of other menu, override direction */
if (pup->slideout) if (pup->slideout) {
UI_block_direction_set(block, UI_DIR_RIGHT); UI_block_direction_set(block, UI_DIR_RIGHT);
}
return pup->block; return pup->block;
} }
@@ -334,9 +341,10 @@ uiPopupBlockHandle *ui_popup_menu_create(
pup->block->flag |= UI_BLOCK_NO_FLIP; pup->block->flag |= UI_BLOCK_NO_FLIP;
} }
#endif #endif
if (but->context) if (but->context) {
uiLayoutContextCopy(pup->layout, but->context); uiLayoutContextCopy(pup->layout, but->context);
} }
}
/* menu is created from a callback */ /* menu is created from a callback */
pup->menu_func = menu_func; pup->menu_func = menu_func;