[Bf-blender-cvs] [bffa829] wiggly-widgets: Move priority of widget handler back for node editor. Still not very clean but should allow gooseberrians to work a little better
Antony Riakiotakis
noreply at git.blender.org
Thu Feb 5 12:29:54 CET 2015
Commit: bffa829b405be78f068860b79a7e7ef072d7d54e
Author: Antony Riakiotakis
Date: Thu Feb 5 12:29:37 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rBbffa829b405be78f068860b79a7e7ef072d7d54e
Move priority of widget handler back for node editor. Still not very
clean but should allow gooseberrians to work a little better
===================================================================
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/windowmanager/intern/wm_widgets.c
===================================================================
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index e2f6ed1..0ebe52d 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -649,6 +649,13 @@ static void node_main_area_init(wmWindowManager *wm, ARegion *ar)
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
+ /* widgets stay in the background for now - quick patchjob to make sure nodes themselves work */
+ if (BLI_listbase_is_empty(&ar->widgetmaps)) {
+ BLI_addhead(&ar->widgetmaps, WM_widgetmap_from_type("Node_Canvas", SPACE_NODE, RGN_TYPE_WINDOW, false));
+ }
+
+ WM_event_add_area_widgetmap_handlers(ar);
+
/* own keymaps */
keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
@@ -660,13 +667,6 @@ static void node_main_area_init(wmWindowManager *wm, ARegion *ar)
lb = WM_dropboxmap_find("Node Editor", SPACE_NODE, RGN_TYPE_WINDOW);
WM_event_add_dropbox_handler(&ar->handlers, lb);
-
- /* make sure we have a widgetmap - sucks a bit to do it here, but works for now */
- if (BLI_listbase_is_empty(&ar->widgetmaps)) {
- BLI_addhead(&ar->widgetmaps, WM_widgetmap_from_type("Node_Canvas", SPACE_NODE, RGN_TYPE_WINDOW, false));
- }
-
- WM_event_add_area_widgetmap_handlers(ar);
}
static void node_main_area_draw(const bContext *C, ARegion *ar)
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 49fc9c2..81f5886 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -478,7 +478,13 @@ static void view3d_main_area_init(wmWindowManager *wm, ARegion *ar)
{
ListBase *lb;
wmKeyMap *keymap;
-
+
+ if (BLI_listbase_is_empty(&ar->widgetmaps)) {
+ BLI_addhead(&ar->widgetmaps, WM_widgetmap_from_type("View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW, true));
+ }
+
+ WM_event_add_area_widgetmap_handlers(ar);
+
/* object ops. */
/* important to be before Pose keymap since they can both be enabled at once */
@@ -556,12 +562,6 @@ static void view3d_main_area_init(wmWindowManager *wm, ARegion *ar)
lb = WM_dropboxmap_find("View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW);
WM_event_add_dropbox_handler(&ar->handlers, lb);
-
- if (BLI_listbase_is_empty(&ar->widgetmaps)) {
- BLI_addhead(&ar->widgetmaps, WM_widgetmap_from_type("View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW, true));
- }
-
- WM_event_add_area_widgetmap_handlers(ar);
}
static void view3d_main_area_exit(wmWindowManager *wm, ARegion *ar)
diff --git a/source/blender/windowmanager/intern/wm_widgets.c b/source/blender/windowmanager/intern/wm_widgets.c
index 9f02428..bb6e6c5 100644
--- a/source/blender/windowmanager/intern/wm_widgets.c
+++ b/source/blender/windowmanager/intern/wm_widgets.c
@@ -365,7 +365,7 @@ void WM_event_add_area_widgetmap_handlers(ARegion *ar)
handler = MEM_callocN(sizeof(wmEventHandler), "widget handler");
handler->widgetmap = wmap;
- BLI_addhead(&ar->handlers, handler);
+ BLI_addtail(&ar->handlers, handler);
}
}
More information about the Bf-blender-cvs
mailing list