feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CompilerExplorer: Fix undo

Browse Source 
Fixes context handling for the Editor. This allows Undo/Redo actions to
activate correctly.

Change-Id: Ieb7fa27215f5746cf5f26e8e7b3b74f44023481c
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marcus Tillmanns
2023-09-26 10:43:33 +02:00
parent 399e12c973
commit fe430bebbe
7 changed files with 187 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/plugins/texteditor/texteditoractionhandler.cpp
View File

@@ -62,8 +62,18 @@ public:
Utils::Id menueGroup = Utils::Id(),
Core::ActionContainer *container = nullptr)
{
return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
[this, slot](bool) { if (m_currentEditorWidget) slot(m_currentEditorWidget); });
return registerActionHelper(id,
scriptable,
title,
keySequence,
menueGroup,
container,
[this, slot, id](bool) {
if (m_currentEditorWidget)
slot(m_currentEditorWidget);
else if (m_unhandledCallback)
m_unhandledCallback(id, m_currentEditor);
});
}
QAction *registerBoolAction(Utils::Id id,
@@ -135,6 +145,8 @@ public:
TextEditorActionHandler::Predicate m_canUndoCallback;
TextEditorActionHandler::Predicate m_canRedoCallback;
TextEditorActionHandler::UnhandledCallback m_unhandledCallback;
};
TextEditorActionHandlerPrivate::TextEditorActionHandlerPrivate
@@ -478,17 +490,28 @@ void TextEditorActionHandlerPrivate::updateActions()
m_textWrappingAction->setChecked(m_currentEditorWidget->displaySettings().m_textWrapping);
}
if (m_currentEditorWidget) {
updateRedoAction(m_canRedoCallback ? m_canRedoCallback(m_currentEditor)
: m_currentEditorWidget->document()->isRedoAvailable());
updateUndoAction(m_canUndoCallback ? m_canUndoCallback(m_currentEditor)
: m_currentEditorWidget->document()->isUndoAvailable());
updateCopyAction(m_currentEditorWidget->textCursor().hasSelection());
} else {
updateRedoAction(false);
updateUndoAction(false);
updateCopyAction(false);
bool canRedo = false;
bool canUndo = false;
bool canCopy = false;
if (m_currentEditor && m_currentEditor->document()
&& m_currentEditor->document()->id() == m_editorId) {
canRedo = m_canRedoCallback ? m_canRedoCallback(m_currentEditor) : false;
canUndo = m_canUndoCallback ? m_canUndoCallback(m_currentEditor) : false;
if (m_currentEditorWidget) {
canRedo = m_canRedoCallback ? canRedo
: m_currentEditorWidget->document()->isRedoAvailable();
canUndo = m_canUndoCallback ? canUndo
: m_currentEditorWidget->document()->isUndoAvailable();
canCopy = m_currentEditorWidget->textCursor().hasSelection();
}
}
updateRedoAction(canRedo);
updateUndoAction(canUndo);
updateCopyAction(canCopy);
updateOptionalActions();
}
@@ -553,19 +576,19 @@ void TextEditorActionHandlerPrivate::updateCurrentEditor(Core::IEditor *editor)
m_currentEditor = editor;
if (editor && editor->document()->id() == m_editorId) {
TextEditorWidget *editorWidget = m_findTextWidget(editor);
QTC_ASSERT(editorWidget, return); // editor has our id, so shouldn't happen
m_currentEditorWidget = editorWidget;
connect(editorWidget, &QPlainTextEdit::undoAvailable,
this, &TextEditorActionHandlerPrivate::updateUndoAction);
connect(editorWidget, &QPlainTextEdit::redoAvailable,
this, &TextEditorActionHandlerPrivate::updateRedoAction);
connect(editorWidget, &QPlainTextEdit::copyAvailable,
this, &TextEditorActionHandlerPrivate::updateCopyAction);
connect(editorWidget, &TextEditorWidget::readOnlyChanged,
this, &TextEditorActionHandlerPrivate::updateActions);
connect(editorWidget, &TextEditorWidget::optionalActionMaskChanged,
this, &TextEditorActionHandlerPrivate::updateOptionalActions);
m_currentEditorWidget = m_findTextWidget(editor);
if (m_currentEditorWidget) {
connect(m_currentEditorWidget, &QPlainTextEdit::undoAvailable,
this, &TextEditorActionHandlerPrivate::updateUndoAction);
connect(m_currentEditorWidget, &QPlainTextEdit::redoAvailable,
this, &TextEditorActionHandlerPrivate::updateRedoAction);
connect(m_currentEditorWidget, &QPlainTextEdit::copyAvailable,
this, &TextEditorActionHandlerPrivate::updateCopyAction);
connect(m_currentEditorWidget, &TextEditorWidget::readOnlyChanged,
this, &TextEditorActionHandlerPrivate::updateActions);
connect(m_currentEditorWidget, &TextEditorWidget::optionalActionMaskChanged,
this, &TextEditorActionHandlerPrivate::updateOptionalActions);
}
}
updateActions();
}
@@ -614,4 +637,9 @@ void TextEditorActionHandler::setCanRedoCallback(const Predicate &callback)
d->m_canRedoCallback = callback;
}
void TextEditorActionHandler::setUnhandledCallback(const UnhandledCallback &callback)
{
d->m_unhandledCallback = callback;
}
} // namespace TextEditor