Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-03-25 23:49:15 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-03-25 23:49:15 +0300
commitd93fd9ffc132cf094dec0d3c65bd0726718c66a5 (patch)
tree6d4206f183f06c37f1d61138ddf777bdfb9a16e5 /source/blender/editors/interface/interface_regions.c
parent985a4c1e5ed9c00face5bcf69048bf108ff99aaf (diff)
UI:
* Screen level regions created for menus are now a separate CTX_wm_menu in the context, so they don't interfere with existing regions. * Fix context in popup menus to always come from the area and region the popup was opened from. * Removed some unused context stuff: tasks and reports. The places that were using context reports were using it wrong anyway. * Fix F6 closing immediately after editing a button, by making uiBlockSetFlag not clear existing flags anymore. * Don't use ":" in boolean X/Y/Z buttons.
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
-rw-r--r--source/blender/editors/interface/interface_regions.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 06fddc48013..f9a7934d5b3 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -2223,7 +2223,7 @@ void uiPupMenuEnd(bContext *C, uiMenuItem *head)
menu= ui_popup_block_create(C, NULL, NULL, NULL, ui_block_func_MENU_ITEM, &info);
menu->popup= 1;
- UI_add_popup_handlers(&window->handlers, menu);
+ UI_add_popup_handlers(C, &window->handlers, menu);
WM_event_add_mousemove(C);
BLI_freelistN(&head->items);
@@ -2248,7 +2248,7 @@ static uiPopupBlockHandle *ui_pup_menu(bContext *C, int maxrow, uiMenuHandleFunc
menu= ui_popup_block_create(C, NULL, NULL, NULL, ui_block_func_PUPMENU, &info);
menu->popup= 1;
- UI_add_popup_handlers(&window->handlers, menu);
+ UI_add_popup_handlers(C, &window->handlers, menu);
WM_event_add_mousemove(C);
menu->popup_func= func;
@@ -2399,7 +2399,7 @@ void uiPupBlockO(bContext *C, uiBlockCreateFunc func, void *arg, char *opname, i
handle->opname= opname;
handle->opcontext= opcontext;
- UI_add_popup_handlers(&window->handlers, handle);
+ UI_add_popup_handlers(C, &window->handlers, handle);
WM_event_add_mousemove(C);
}