[Bf-blender-cvs] [6c64d85] workspaces: Rename notifier category: NC_SCREEN -> NC_WORKSPACE
Julian Eisel
noreply at git.blender.org
Tue Dec 6 23:53:24 CET 2016
Commit: 6c64d85eb4c1fc7f472df49d4794eb77ee05b00d
Author: Julian Eisel
Date: Tue Dec 6 23:52:52 2016 +0100
Branches: workspaces
https://developer.blender.org/rB6c64d85eb4c1fc7f472df49d4794eb77ee05b00d
Rename notifier category: NC_SCREEN -> NC_WORKSPACE
===================================================================
M source/blender/editors/armature/editarmature_sketch.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/screen/screendump.c
M source/blender/editors/screen/workspace_edit.c
M source/blender/editors/space_clip/space_clip.c
M source/blender/editors/space_info/space_info.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_time/space_time.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/makesrna/intern/rna_mask.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/makesrna/intern/rna_workspace.c
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c
index cc4c180..46a09fa 100644
--- a/source/blender/editors/armature/editarmature_sketch.c
+++ b/source/blender/editors/armature/editarmature_sketch.c
@@ -2177,7 +2177,7 @@ static int sketch_delete(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNU
sk_deleteSelectedStrokes(sketch);
// allqueue(REDRAWVIEW3D, 0);
}
- WM_event_add_notifier(C, NC_SCREEN | ND_SKETCH | NA_REMOVED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | ND_SKETCH | NA_REMOVED, NULL);
return OPERATOR_FINISHED;
}
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index cbd8714..96e55a5 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1093,7 +1093,7 @@ void ED_screen_do_listen(bContext *C, wmNotifier *note)
case NC_WINDOW:
screen->do_draw = true;
break;
- case NC_SCREEN:
+ case NC_WORKSPACE:
if (note->action == NA_EDITED)
screen->do_draw = screen->do_refresh = true;
break;
@@ -1527,7 +1527,7 @@ void screen_set_refresh(Main *bmain, bContext *C, wmWindow *win, bool scene_chan
ED_screen_refresh(CTX_wm_manager(C), CTX_wm_window(C));
WM_event_add_notifier(C, NC_WINDOW, NULL);
- WM_event_add_notifier(C, NC_SCREEN | ND_SCREENSET, sc);
+ WM_event_add_notifier(C, NC_WORKSPACE | ND_SCREENSET, sc);
/* makes button hilites work */
WM_event_add_mousemove(C);
@@ -2104,7 +2104,7 @@ void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync,
}
/* notifier catched by top header, for button */
- WM_event_add_notifier(C, NC_SCREEN | ND_ANIMPLAY, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | ND_ANIMPLAY, NULL);
}
/* helper for screen_animation_play() - only to be used for TimeLine */
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index f9c7db6..4c8e025 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -947,7 +947,7 @@ static int area_swap_modal(bContext *C, wmOperator *op, const wmEvent *event)
area_swap_exit(C, op);
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -1025,7 +1025,7 @@ static int area_dupli_invoke(bContext *C, wmOperator *op, const wmEvent *event)
ED_area_tag_redraw((ScrArea *)newsc->areabase.first);
/* screen, areas init */
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
finally:
@@ -1224,7 +1224,7 @@ static void area_move_apply_do(bContext *C, int origval, int delta, int dir, int
ED_area_tag_redraw(sa);
}
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL); /* redraw everything */
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL); /* redraw everything */
/* Update preview thumbnail */
BKE_icon_changed(sc->id.icon_id);
}
@@ -1514,7 +1514,7 @@ static int area_split_apply(bContext *C, wmOperator *op)
ED_area_tag_redraw(sd->sarea);
ED_area_tag_redraw(sd->narea);
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
/* Update preview thumbnail */
BKE_icon_changed(sc->id.icon_id);
@@ -1539,7 +1539,7 @@ static void area_split_exit(bContext *C, wmOperator *op)
}
WM_cursor_modal_restore(CTX_wm_window(C));
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
/* this makes sure aligned edges will result in aligned grabbing */
removedouble_scrverts(CTX_wm_screen(C));
@@ -2025,7 +2025,7 @@ static int region_scale_modal(bContext *C, wmOperator *op, const wmEvent *event)
region_scale_toggle_hidden(C, rmd);
}
ED_area_tag_redraw(rmd->sa);
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
break;
@@ -2041,7 +2041,7 @@ static int region_scale_modal(bContext *C, wmOperator *op, const wmEvent *event)
}
ED_area_tag_redraw(rmd->sa);
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
}
MEM_freeN(op->customdata);
op->customdata = NULL;
@@ -2720,7 +2720,7 @@ static int area_join_modal(bContext *C, wmOperator *op, const wmEvent *event)
ED_area_tag_redraw(jd->sa2);
area_join_apply(C, op);
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
area_join_exit(C, op);
return OPERATOR_FINISHED;
}
@@ -3054,7 +3054,7 @@ static int region_quadview_exec(bContext *C, wmOperator *op)
}
}
ED_area_tag_redraw(sa);
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
}
else if (ar->next) {
BKE_report(op->reports, RPT_ERROR, "Only last region can be 4-splitted");
@@ -3099,7 +3099,7 @@ static int region_quadview_exec(bContext *C, wmOperator *op)
#endif
}
ED_area_tag_redraw(sa);
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
}
@@ -3140,7 +3140,7 @@ static int region_flip_exec(bContext *C, wmOperator *UNUSED(op))
ar->alignment = RGN_ALIGN_LEFT;
ED_area_tag_redraw(CTX_wm_area(C));
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -3172,7 +3172,7 @@ static int header_exec(bContext *C, wmOperator *UNUSED(op))
ED_area_tag_redraw(CTX_wm_area(C));
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -3211,7 +3211,7 @@ static int header_flip_exec(bContext *C, wmOperator *UNUSED(op))
ED_area_tag_redraw(CTX_wm_area(C));
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -3243,7 +3243,7 @@ static int header_toggle_menus_exec(bContext *C, wmOperator *UNUSED(op))
sa->flag = sa->flag ^ HEADER_NO_PULLDOWN;
ED_area_tag_redraw(sa);
- WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_WORKSPACE | NA_EDITED, NULL);
return OPERATOR_FINISHED;
}
@@ -3883,7 +3883,7 @@ static int screen_new_exec(bContext *C, wmOperator *UNUSED(op))
WorkSpaceLayout *layout_new;
layout_new = ED_workspace_layout_duplicate(workspace, layout_old, win);
- WM_event_add_notifier(C, NC_SCREEN | ND_SCREENBROWSE, layout_new);
+ WM_event_add_notifier(C, NC_WORKSPACE | ND_SCREENBROWSE, layout_new);
return OPERATOR_FINISHED;
}
@@ -3908,7 +3908,7 @@ static int screen_delete_exec(bContext *C, wmOperator *UNUSED(op))
WorkSpace *workspace = CTX_wm_workspace(C);
WorkSpaceLayout *layout = BKE_workspace_layout_find(workspace, sc);
- WM_event_add_notifier(C, NC_SCREEN | ND_SCREENDELETE, layout);
+ WM_event_add_notifier(C, NC_WORKSPACE | ND_SCREENDELETE, layout);
return OPERATOR_FINISHED;
}
diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c
index 6bfa51b..241d14a 100644
--- a/source/blender/editors/screen/screendump.c
+++ b/source/blender/editors/screen/screendump.c
@@ -534,14 +534,14 @@ static int screencast_exec(bContext *C, wmOperator *op)
/* setup job */
WM_jobs_customdata_set(wm_job, sj, screenshot_freejob);
- WM_jobs_timer(wm_job, 0.1, 0, NC_SCREEN | ND_SCREENCAST);
+ WM_jobs_timer(wm_job, 0.1, 0, NC_WORKSPACE | ND_SCREENCAST);
WM_jobs_callbacks(wm_job, screenshot_startjob, NULL, screenshot_updatejob, screenshot_endjob);
WM_jobs_start(sj->wm, wm_job);
screencast_cursor_toggle(sj->wm, 1);
- WM_event_add_notifier(C, NC_SCREEN | ND_SCREENCAST, screen);
+ WM_event_add_notifier(C, NC_WORKSPACE | ND_SCREENCAST, screen);
return OPERATOR_FINISHED;
}
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c
index bf8be42..6aa17a9 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -131,7 +131,7 @@ static int workspace_new_exec(bContext *C, wmOperator *UNUSED(op))
WorkSpace *workspace;
workspace = ED_workspace_duplicate(workspace_old, bmain, win);
- WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_SET, workspace);
+ WM_event_add_notifier(C, NC_WORKSPACE | ND_WORKSPACE_SET, workspace);
return OPERATOR_FINISHED;
}
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index 05e6996..9786992 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -389,7 +389,7 @@ static void clip_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
break;
}
break;
- case NC_SCREEN:
+ case NC_WORKSPACE:
switch (wmn->data) {
case ND_ANIMPLAY:
ED_area_tag_redraw(sa);
diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c
index 21777fd..81d3934 100644
--- a/source/blender/editors/space_info/space_info.c
+++ b/source/blender/editors/space_info/space_info.c
@@ -255,7 +255,7 @@ static void info_header_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegi
{
/* context changes */
switch (wmn->category) {
- case NC_SCREEN:
+ case NC_WORKSPACE:
if (ELEM(wmn->data, ND_SCREENCAST, ND_ANIMPLAY))
ED_region_tag_redraw(ar);
break;
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index bbdf6fe..ebc6dec 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -466,7 +466,7 @@ static void node_area_listener(bScreen *sc, ScrArea *sa, wmNotifier *wmn)
else if (wmn->action == NA_SELECTED)
ED_area_tag_redraw(sa);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list