blender
/
blender
135
425
Fork 608
Code Issues 6.2k Pull Requests 780 Projects 19 Wiki Activity

UI Demonstration: Undo History as Actions, not Waypoints #117096

Closed
Harley Acheson wants to merge 3 commits from Harley/blender:UndoHistory into main
pull from: Harley/blender:UndoHistory
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 12 Commits 3 Files Changed 4 +17 -4
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d034505f2b - Show all commits

21
source/blender/editors/space_topbar/space_topbar.cc
View File

@ -237,6 +237,10 @@ static void undo_history_draw_menu(const bContext *C, Menu *menu)
/* Reverse the order so the most recent state is first in the menu. */
int i = undo_step_count_all - 1;
/* Is this step an undo or a redo? */
bool is_undo = false;
for (UndoStep *us = static_cast<UndoStep *>(wm->undo_stack->steps.last); us; us = us->prev, i--)
{
if (us->skip) {
@ -246,14 +250,23 @@ static void undo_history_draw_menu(const bContext *C, Menu *menu)
column = uiLayoutColumn(split, false);
}
const bool is_active = (us == wm->undo_stack->step_active);
uiLayout *row = uiLayoutRow(column, false);
uiLayoutSetEnabled(row, !is_active);
uiItemIntO(row,
if (is_active) {
if (undo_step_count > 0) {
/* Horizontal line to indicate current position. */
uiItemS_ex(column, 0.2f);
}
/* Items from now on are undo, before this were redo. */
is_undo = true;
}
const int undo_step = MAX2(is_undo ? i - 1 : i, 0);
uiItemIntO(column,
CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, us->name),
is_active ? ICON_LAYER_ACTIVE : ICON_NONE,
"ED_OT_undo_history",
"item",
i);
undo_step);
undo_step_count += 1;
}
}