Revision: 17792
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17792
Author: blendix
Date: 2008-12-11 21:30:41 +0100 (Thu, 11 Dec 2008)
Log Message:
-----------
UI: restored mechanism to only call button/block callback functions
after the menus are closed, to avoid conflicts with those callbacks
manipulating their own area or region.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/editors/interface/interface.h
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2008-12-11 20:28:36 UTC (rev 17791)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2008-12-11 20:30:41 UTC (rev 17792)
@@ -1948,9 +1948,6 @@
but->func_arg2= block->func_arg2;
}
- but->handle_func= block->handle_func;
- but->handle_func_arg= block->handle_func_arg;
-
ui_set_embossfunc(but, block->dt);
but->pos= -1; /* cursor invisible */
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface.h
2008-12-11 20:28:36 UTC (rev 17791)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.h
2008-12-11 20:30:41 UTC (rev 17792)
@@ -129,9 +129,6 @@
void *func_arg1;
void *func_arg2;
- void (*handle_func)(struct bContext*, void *arg, int event);
- void *handle_func_arg;
-
void (*embossfunc)(int , int , float, float, float, float, float, int);
void (*sliderfunc)(int , float, float, float, float, float, float, int);
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2008-12-11 20:28:36 UTC (rev 17791)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2008-12-11 20:30:41 UTC (rev 17792)
@@ -134,26 +134,75 @@
uiBut *postbut;
} uiHandleButtonData;
+typedef struct uiAfterFunc {
+ struct uiAfterFunc *next, *prev;
+
+ void (*func)(struct bContext*, void *, void *);
+ void *func_arg1;
+ void *func_arg2;
+
+ void (*handle_func)(struct bContext*, void *arg, int event);
+ void *handle_func_arg;
+ int retval;
+
+ void (*butm_func)(struct bContext*, void *arg, int event);
+ void *butm_func_arg;
+ int a2;
+} uiAfterFunc;
+
static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState
state);
static int ui_handler_window(bContext *C, wmEvent *event);
-/* ********************** button apply/revert ************************ */
+/* ********************** button apply/revert ************************/
+static ListBase UIAfterFuncs = {NULL, NULL};
+
static void ui_apply_but_func(bContext *C, uiBut *but)
{
+ uiAfterFunc *after;
uiBlock *block= but->block;
- if(but->func)
- but->func(C, but->func_arg1, but->func_arg2);
-
- if(block) {
- if(block->handle_func)
- block->handle_func(C, block->handle_func_arg,
but->retval);
- if(but->type == BUTM && block->butm_func)
- block->butm_func(C, block->butm_func_arg, but->a2);
+ /* these functions are postponed and only executed after all other
+ * handling is done, i.e. menus are closed, in order to avoid conflicts
+ * with these functions removing the buttons we are working with */
+
+ if(but->func || block->handle_func || (but->type == BUTM &&
block->butm_func)) {
+ after= MEM_callocN(sizeof(uiAfterFunc), "uiAfterFunc");
+ after->func= but->func;
+ after->func_arg1= but->func_arg1;
+ after->func_arg2= but->func_arg2;
+
+ after->handle_func= block->handle_func;
+ after->handle_func_arg= block->handle_func_arg;
+ after->retval= but->retval;
+
+ if(but->type == BUTM) {
+ after->butm_func= block->butm_func;
+ after->butm_func_arg= block->butm_func_arg;
+ after->a2= but->a2;
+ }
+
+ BLI_addtail(&UIAfterFuncs, after);
}
}
+static void ui_apply_but_funcs_after(bContext *C)
+{
+ uiAfterFunc *after;
+
+ for(after=UIAfterFuncs.first; after; after=after->next) {
+ if(after->func)
+ after->func(C, after->func_arg1, after->func_arg2);
+
+ if(after->handle_func)
+ after->handle_func(C, after->handle_func_arg,
after->retval);
+ if(after->butm_func)
+ after->butm_func(C, after->butm_func_arg, after->a2);
+ }
+
+ BLI_freelistN(&UIAfterFuncs);
+}
+
static void ui_apply_but_BUT(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
@@ -3472,6 +3521,9 @@
/* re-enable tooltips */
if(event->type == MOUSEMOVE && (event->x!=event->prevx ||
event->y!=event->prevy))
ui_blocks_set_tooltips(ar, 1);
+
+ /* delayed apply callbacks */
+ ui_apply_but_funcs_after(C);
return retval;
}
@@ -3484,6 +3536,12 @@
if(ar==NULL) return;
uiFreeBlocks(C, &ar->uiblocks);
+
+ /* delayed apply callbacks, but not for screen level regions, those
+ * we rather do at the very end after closing them all, which will
+ * be done in ui_handler_region/window */
+ if(BLI_findindex(&C->screen->regionbase, ar) == -1)
+ ui_apply_but_funcs_after(C);
}
static int ui_handler_window(bContext *C, wmEvent *event)
@@ -3526,6 +3584,9 @@
if(event->type == MOUSEMOVE && (event->x!=event->prevx ||
event->y!=event->prevy))
ui_blocks_set_tooltips(ar, 1);
+ /* delayed apply callbacks */
+ ui_apply_but_funcs_after(C);
+
/* we block all events, this is modal interaction */
return WM_UI_HANDLER_BREAK;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
