griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix workspace order and shortcut keys not matching.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-09-11 16:20:29 +02:00
parent 5a7c3d5a08
commit 19082763dd
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/editors/screen/screen_ops.c
View File

@@ -4712,15 +4712,37 @@ static int space_workspace_cycle_invoke(bContext *C, wmOperator *op, const wmEve
Main *bmain = CTX_data_main(C);
const int direction = RNA_enum_get(op->ptr, "direction");
WorkSpace *workspace_src = WM_window_get_active_workspace(win);
WorkSpace *workspace_dst = (direction == SPACE_CONTEXT_CYCLE_PREV) ? workspace_src->id.prev : workspace_src->id.next;
WorkSpace *workspace_dst = NULL;
ListBase ordered;
BKE_id_ordered_list(&ordered, &bmain->workspaces);
for (LinkData *link = ordered.first; link; link = link->next) {
if (link->data == workspace_src) {
if (direction == SPACE_CONTEXT_CYCLE_PREV) {
workspace_dst = (link->prev) ? link->prev->data : NULL;
}
else {
workspace_dst = (link->next) ? link->next->data : NULL;
}
}
}
if (workspace_dst == NULL) {
workspace_dst = (direction == SPACE_CONTEXT_CYCLE_PREV) ? bmain->workspaces.last : bmain->workspaces.first;
LinkData *link = (direction == SPACE_CONTEXT_CYCLE_PREV) ? ordered.last : ordered.first;
workspace_dst = link->data;
}
if (workspace_src != workspace_dst) {
win->workspace_hook->temp_workspace_store = workspace_dst;
WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_SET, workspace_dst);
win->workspace_hook->temp_workspace_store = NULL;
BLI_freelistN(&ordered);
if (workspace_src == workspace_dst) {
return OPERATOR_CANCELLED;
}
win->workspace_hook->temp_workspace_store = workspace_dst;
WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_SET, workspace_dst);
win->workspace_hook->temp_workspace_store = NULL;
return OPERATOR_FINISHED;
}