[Bf-blender-cvs] [c3594f6469f] blender2.8: UI: remove layout choosing menu from new window operator.

[Brecht Van Lommel]

Commit: c3594f6469fbbdd433ee20923cab62c33c271946
Author: Brecht Van Lommel
Date:   Wed Jun 27 12:29:22 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc3594f6469fbbdd433ee20923cab62c33c271946

UI: remove layout choosing menu from new window operator.

The handling of multiple window layouts within a workspace is intended to
be automatic now, this was a leftover from an earlier design.

===================================================================

M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/intern/wm_window.c
M	source/blender/windowmanager/wm_window.h

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 5f66deefb93..b2b82af7992 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2304,20 +2304,12 @@ static void WM_OT_window_close(wmOperatorType *ot)
 
 static void WM_OT_window_new(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-
 	ot->name = "New Window";
 	ot->idname = "WM_OT_window_new";
 	ot->description = "Create a new Blender window";
 
 	ot->exec = wm_window_new_exec;
-	ot->invoke = wm_window_new_invoke;
 	ot->poll = wm_operator_winactive_normal;
-
-	prop = RNA_def_enum(ot->srna, "screen", DummyRNA_NULL_items, 0, "Screen", "");
-	RNA_def_enum_funcs(prop, wm_window_new_screen_itemf);
-	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
-	ot->prop = prop;
 }
 
 static void WM_OT_window_fullscreen_toggle(wmOperatorType *ot)
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index b03b156b78c..7f15cbb4a85 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -271,26 +271,6 @@ wmWindow *wm_window_new(bContext *C)
 	return win;
 }
 
-/**
- * A higher level version of copy that tests the new window can be added.
- */
-static wmWindow *wm_window_new_test(bContext *C)
-{
-	wmWindow *win = wm_window_new(C);
-
-	WM_check(C);
-
-	if (win->ghostwin) {
-		WM_event_add_notifier(C, NC_WINDOW | NA_ADDED, NULL);
-		return win;
-	}
-	else {
-		wmWindowManager *wm = CTX_wm_manager(C);
-		wm_window_close(C, wm, win);
-		return NULL;
-	}
-}
-
 /* part of wm_window.c api */
 wmWindow *wm_window_copy(bContext *C, wmWindow *win_src, const bool duplicate_layout)
 {
@@ -996,109 +976,17 @@ int wm_window_close_exec(bContext *C, wmOperator *UNUSED(op))
 	return OPERATOR_FINISHED;
 }
 
-static WorkSpaceLayout *wm_window_new_find_layout(wmOperator *op, WorkSpace *workspace)
+/* operator callback */
+int wm_window_new_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	ListBase *listbase = BKE_workspace_layouts_get(workspace);
-	const int layout_id = RNA_enum_get(op->ptr, "screen");
-	int i = 0;
-
-	for (WorkSpaceLayout *layout = listbase->first; layout; layout = layout->next) {
-		if (i++ == layout_id) {
-			return layout;
-		}
-	}
-
-	BLI_assert(0);
-	return NULL;
-}
-
-/* new window operator callback */
-int wm_window_new_exec(bContext *C, wmOperator *op)
-{
-	Main *bmain = CTX_data_main(C);
 	wmWindow *win_src = CTX_wm_window(C);
-	WorkSpace *workspace = WM_window_get_active_workspace(win_src);
-	WorkSpaceLayout *layout_new = wm_window_new_find_layout(op, workspace);
-	bScreen *screen_new = BKE_workspace_layout_screen_get(layout_new);
-	wmWindow *win_dst;
-
-	if ((win_dst = wm_window_new_test(C))) {
-		if (screen_new->winid) {
-			/* layout/screen is already used, duplicate it */
-			layout_new = ED_workspace_layout_duplicate(bmain, workspace, layout_new, win_dst);
-			screen_new = BKE_workspace_layout_screen_get(layout_new);
-		}
-		/* New window with a different screen but same workspace */
-		WM_window_set_active_workspace(win_dst, workspace);
-		WM_window_set_active_screen(win_dst, workspace, screen_new);
-		win_dst->scene = win_src->scene;
-		screen_new->winid = win_dst->winid;
-		CTX_wm_window_set(C, win_dst);
+	bool ok;
 
-		ED_screen_refresh(CTX_wm_manager(C), win_dst);
-	}
-
-	return (win_dst != NULL) ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
-}
+	ok = (wm_window_copy_test(C, win_src, true) != NULL);
 
-int wm_window_new_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
-{
-	wmWindow *win = CTX_wm_window(C);
-	WorkSpace *workspace = WM_window_get_active_workspace(win);
-	ListBase *listbase = BKE_workspace_layouts_get(workspace);
-
-	if (BLI_listbase_count_at_most(listbase, 2) == 1) {
-		RNA_enum_set(op->ptr, "screen", 0);
-		return wm_window_new_exec(C, op);
-	}
-	else {
-		return WM_enum_search_invoke_previews(C, op, 6, 2);
-	}
+	return ok ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
-const EnumPropertyItem *wm_window_new_screen_itemf(
-        bContext *C, struct PointerRNA *UNUSED(ptr), struct PropertyRNA *UNUSED(prop), bool *r_free)
-{
-	if (C == NULL) {
-		return DummyRNA_NULL_items;
-	}
-	wmWindow *win = CTX_wm_window(C);
-	WorkSpace *workspace = WM_window_get_active_workspace(win);
-	ListBase *listbase = BKE_workspace_layouts_get(workspace);
-	EnumPropertyItem *item = NULL;
-	EnumPropertyItem tmp = {0, "", 0, "", ""};
-	int value = 0, totitem = 0;
-	int count_act_screens = 0;
-	/* XXX setting max number of windows to 20. We'd need support
-	 * for dynamic strings in EnumPropertyItem.name to avoid this. */
-	static char active_screens[20][MAX_NAME + 12];
-
-	for (WorkSpaceLayout *layout = listbase->first; layout; layout = layout->next) {
-		bScreen *screen = BKE_workspace_layout_screen_get(layout);
-		const char *layout_name = BKE_workspace_layout_name_get(layout);
-
-		if (screen->winid) {
-			BLI_snprintf(active_screens[count_act_screens], sizeof(*active_screens), "%s (Duplicate)", layout_name);
-			tmp.name = active_screens[count_act_screens++];
-		}
-		else {
-			tmp.name = layout_name;
-		}
-
-		tmp.value = value;
-		tmp.identifier = layout_name;
-		UI_id_icon_render(C, CTX_data_scene(C), &screen->id, true, false);
-		tmp.icon = BKE_icon_id_ensure(&screen->id);
-
-		RNA_enum_item_add(&item, &totitem, &tmp);
-		value++;
-	}
-
-	RNA_enum_item_end(&item, &totitem);
-	*r_free = true;
-
-	return item;
-}
 
 /* fullscreen operator callback */
 int wm_window_fullscreen_toggle_exec(bContext *C, wmOperator *UNUSED(op))
diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h
index 436cf66df85..305a5387c96 100644
--- a/source/blender/windowmanager/wm_window.h
+++ b/source/blender/windowmanager/wm_window.h
@@ -84,10 +84,7 @@ int			wm_window_close_exec(bContext *C, struct wmOperator *op);
 int			wm_window_fullscreen_toggle_exec(bContext *C, struct wmOperator *op);
 void		wm_quit_with_optional_confirmation_prompt(bContext *C, wmWindow *win) ATTR_NONNULL();
 
-const struct EnumPropertyItem *wm_window_new_screen_itemf(
-        bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, bool *r_free);
 int			wm_window_new_exec(bContext *C, struct wmOperator *op);
-int			wm_window_new_invoke(bContext *C, struct wmOperator *op, const struct wmEvent *event);
 
 /* Initial (unmaximized) size to start with for
  * systems that can't find it for themselves (X11).