Skip to content

Group text edits for undo/redo unless preview is live #3563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ethancrawford wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Group text edits for undo/redo unless preview is live #3563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions app/gui/widgets/sonicpiscintilla.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2467,10 +2467,14 @@ bool SonicPiScintilla::event(QEvent* evt)
// The backstop below would otherwise run the full completion pipeline a
// second time off this edit's textChanged, before the caret settles.
m_keyEditGuard = true;
SendScintilla(SCI_BEGINUNDOACTION);
// Drop the preview first so the keystroke edits the user's typed text (or,
// for a slider, leaves its committed value), then let the editor process it.
if (m_pvStart >= 0) clearPreview();
if (m_pvLive)
{
SendScintilla(SCI_BEGINUNDOACTION);
// Drop the preview first so the keystroke edits the user's typed text
// (or, for a slider, leaves its committed value), then let the editor
// process it.
if (m_pvStart >= 0) clearPreview();
}

// Let the editor insert/delete the character, then refresh the popup. This
// path runs after the edit fully settles (cursor advanced), so the context
Expand Down Expand Up @@ -2510,7 +2514,10 @@ bool SonicPiScintilla::event(QEvent* evt)
break;
}
}
SendScintilla(SCI_ENDUNDOACTION);
if (m_pvLive)
{
SendScintilla(SCI_ENDUNDOACTION);
}
m_keyEditGuard = false;
return res;
}
Expand Down
Loading