diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-23 16:58:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-23 16:58:55 +0300 |
| commit | 7b036e1dcb42f34020bff3d15071526b5d2cd479 (patch) | |
| tree | 6608aee0a6397fc7735c2d183b3a8d1f8612182b /source/blender/editors/interface/interface_regions.c | |
| parent | fc1c411e2c43b7dc1641b7152076b85770e96f78 (diff) | |
Splash screen, implemented by Matt.
* Now has documentation links and recent files.
* Click on image or outside splash to make it go away.
* Still has old image, new one will be committed later.
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 2c4fb71af75..c3eac3f3893 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1303,7 +1303,7 @@ uiPopupBlockHandle *ui_popup_block_create(bContext *C, ARegion *butregion, uiBut bt->y2 -= ar->winrct.ymin; } - block->flag |= UI_BLOCK_LOOP|UI_BLOCK_MOVEMOUSE_QUIT; + block->flag |= UI_BLOCK_LOOP; /* adds subwindow */ ED_region_init(C, ar); @@ -1338,6 +1338,8 @@ static void ui_block_func_MENUSTR(bContext *C, uiLayout *layout, void *arg_str) char *instr= arg_str; int columns, rows, a, b; + uiBlockSetFlag(block, UI_BLOCK_MOVEMOUSE_QUIT); + /* compute menu data */ md= decompose_menu_string(instr); @@ -1414,6 +1416,8 @@ void ui_block_func_ICONROW(bContext *C, uiLayout *layout, void *arg_but) uiBut *but= arg_but; int a; + uiBlockSetFlag(block, UI_BLOCK_MOVEMOUSE_QUIT); + for(a=(int)but->hardmin; a<=(int)but->hardmax; a++) uiDefIconButF(block, BUTM|FLO, B_NOP, but->icon+(a-but->hardmin), 0, 0, UI_UNIT_X*5, UI_UNIT_Y, &handle->retvalue, (float)a, 0.0, 0, 0, ""); @@ -1427,6 +1431,8 @@ void ui_block_func_ICONTEXTROW(bContext *C, uiLayout *layout, void *arg_but) MenuData *md; MenuEntry *entry; int a; + + uiBlockSetFlag(block, UI_BLOCK_MOVEMOUSE_QUIT); md= decompose_menu_string(but->str); @@ -1994,6 +2000,8 @@ uiBlock *ui_block_func_COL(bContext *C, uiPopupBlockHandle *handle, void *arg_bu block= uiBeginBlock(C, handle->region, "colorpicker", UI_EMBOSS); + uiBlockSetFlag(block, UI_BLOCK_MOVEMOUSE_QUIT); + VECCOPY(handle->retvec, but->editvec); if(win->eventstate->shift) { uiBlockPickerButtons(block, handle->retvec, hsvcol, oldcol, hexcol, 'p', 0); @@ -2195,6 +2203,8 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi uiBlockLayoutResolve(block, NULL, NULL); + uiBlockSetFlag(block, UI_BLOCK_MOVEMOUSE_QUIT); + if(pup->popup) { uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT|UI_BLOCK_RET_1); uiBlockSetDirection(block, direction); @@ -2548,3 +2558,11 @@ void uiPupBlockOperator(bContext *C, uiBlockCreateFunc func, wmOperator *op, int WM_event_add_mousemove(C); } +void uiPupBlockClose(bContext *C, uiBlock *block) +{ + if(block->handle) { + UI_remove_popup_handlers(&CTX_wm_window(C)->modalhandlers, block->handle); + ui_popup_block_free(C, block->handle); + } +} + |