kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix [#29018] Problem with multi-column dorpdown lists, when scrolling is enabled: the bottom-most elements are not shown.

Browse Source 
ui_popup_block_scrolltest needs to be aware whether uiblock is flip or not, to avoid hiding irrelevant items in multi-column scrolled menus...
This commit is contained in:
Bastien Montagne 2011-11-18 23:10:56 +00:00
parent 5429a701c4
commit 4d31654a61
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/interface_regions.c
View File

@ -1446,6 +1446,8 @@ static void ui_popup_block_clip(wmWindow *window, uiBlock *block)
void ui_popup_block_scrolltest(uiBlock *block) void ui_popup_block_scrolltest(uiBlock *block)
{ {
uiBut *bt; uiBut *bt;
/* Knowing direction is necessary for multi-column menus... */
int is_flip = (block->direction & UI_TOP) && !(block->flag & UI_BLOCK_NO_FLIP);
block->flag &= ~(UI_BLOCK_CLIPBOTTOM|UI_BLOCK_CLIPTOP); block->flag &= ~(UI_BLOCK_CLIPBOTTOM|UI_BLOCK_CLIPTOP);
@ -1462,9 +1464,9 @@ void ui_popup_block_scrolltest(uiBlock *block)
block->flag |= UI_BLOCK_CLIPBOTTOM; block->flag |= UI_BLOCK_CLIPBOTTOM;
/* make space for arrow */ /* make space for arrow */
if(bt->y2 < block->miny +10) { if(bt->y2 < block->miny +10) {
if(bt->next && bt->next->y1 > bt->y1) if(is_flip && bt->next && bt->next->y1 > bt->y1)
bt->next->flag |= UI_SCROLLED; bt->next->flag |= UI_SCROLLED;
if(bt->prev && bt->prev->y1 > bt->y1) else if(!is_flip && bt->prev && bt->prev->y1 > bt->y1)
bt->prev->flag |= UI_SCROLLED; bt->prev->flag |= UI_SCROLLED;
} }
} }
@ -1473,9 +1475,9 @@ void ui_popup_block_scrolltest(uiBlock *block)
block->flag |= UI_BLOCK_CLIPTOP; block->flag |= UI_BLOCK_CLIPTOP;
/* make space for arrow */ /* make space for arrow */
if(bt->y1 > block->maxy -10) { if(bt->y1 > block->maxy -10) {
if(bt->next && bt->next->y2 < bt->y2) if(!is_flip && bt->next && bt->next->y2 < bt->y2)
bt->next->flag |= UI_SCROLLED; bt->next->flag |= UI_SCROLLED;
if(bt->prev && bt->prev->y2 < bt->y2) else if(is_flip && bt->prev && bt->prev->y2 < bt->y2)
bt->prev->flag |= UI_SCROLLED; bt->prev->flag |= UI_SCROLLED;
} }
} }