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

fix for [#10180] File Browser buttons disappear after clicking on Window Type button

Browse Source 
Spent some time looking into what this could break and it seems like a safe change.
This commit is contained in:
Campbell Barton 2008-05-06 23:58:15 +00:00
parent 881802d8a3
commit 7d2e366e8f
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/src/interface.c
View File

@ -2328,6 +2328,7 @@ static int ui_do_but_ICONROW(uiBut *but)
ListBase listb= {NULL, NULL};
uiBlock *block;
int a;
short event;
but->flag |= UI_SELECT;
ui_draw_but(but);
@ -2348,13 +2349,17 @@ static int ui_do_but_ICONROW(uiBut *but)
this is needs better implementation */
block->win= G.curscreen->mainwin;
uiDoBlocks(&listb, 0, 1);
event= uiDoBlocks(&listb, 0, 1);
but->flag &= ~UI_SELECT;
ui_check_but(but);
ui_draw_but(but);
return but->retval;
if (event & UI_RETURN_OK) {
return but->retval;
} else {
return 0;
}
}
static int ui_do_but_ICONTEXTROW(uiBut *but)
@ -2363,7 +2368,7 @@ static int ui_do_but_ICONTEXTROW(uiBut *but)
ListBase listb={NULL, NULL};
int width, a, xmax, ypos;
MenuData *md;
short event;
but->flag |= UI_SELECT;
ui_draw_but(but);
ui_block_flush_back(but->block); // flush because this button creates own blocks loop
@ -2421,7 +2426,7 @@ static int ui_do_but_ICONTEXTROW(uiBut *but)
uiBoundsBlock(block, 3);
uiDoBlocks(&listb, 0, 1);
event = uiDoBlocks(&listb, 0, 1);
menudata_free(md);
@ -2429,10 +2434,12 @@ static int ui_do_but_ICONTEXTROW(uiBut *but)
ui_check_but(but);
ui_draw_but(but);
uibut_do_func(but);
return but->retval;
if (event & UI_RETURN_OK) {
uibut_do_func(but);
return but->retval;
} else {
return 0;
}
}
static int ui_do_but_IDPOIN(uiBut *but)