archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix [#26436] Operator.draw(): UI redraw; UI trimmed

Browse Source
This commit is contained in:
Campbell Barton
2011-03-10 22:22:47 +00:00
parent d6b43fed31
commit ef8aa6cc6a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -940,7 +940,6 @@ static uiBlock *wm_block_create_dialog(bContext *C, ARegion *ar, void *userData)
wmOperator *op= data->op; wmOperator *op= data->op;
uiBlock *block; uiBlock *block;
uiLayout *layout; uiLayout *layout;
uiBut *btn;
uiStyle *style= U.uistyles.first; uiStyle *style= U.uistyles.first;
block = uiBeginBlock(C, ar, "operator dialog", UI_EMBOSS); block = uiBeginBlock(C, ar, "operator dialog", UI_EMBOSS);
@@ -956,9 +955,18 @@ static uiBlock *wm_block_create_dialog(bContext *C, ARegion *ar, void *userData)
/* clear so the OK button is left alone */ /* clear so the OK button is left alone */
uiBlockSetFunc(block, NULL, NULL, NULL); uiBlockSetFunc(block, NULL, NULL, NULL);
/* new column so as not to interfear with custom layouts [#26436] */
{
uiBlock *col_block;
uiLayout *col;
uiBut *btn;
col= uiLayoutColumn(layout, FALSE);
col_block= uiLayoutGetBlock(col);
/* Create OK button, the callback of which will execute op */ /* Create OK button, the callback of which will execute op */
btn= uiDefBut(block, BUT, 0, "OK", 0, 0, 0, 20, NULL, 0, 0, 0, 0, ""); btn= uiDefBut(col_block, BUT, 0, "OK", 0, -30, 0, 20, NULL, 0, 0, 0, 0, "");
uiButSetFunc(btn, dialog_exec_cb, op, block); uiButSetFunc(btn, dialog_exec_cb, op, col_block);
}
/* center around the mouse */ /* center around the mouse */
uiPopupBoundsBlock(block, 4.0f, data->width/-2, data->height/2); uiPopupBoundsBlock(block, 4.0f, data->width/-2, data->height/2);