From 20cd55046fb6f0a5124ebd5c85c37307d4e7fa60 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 13 Oct 2022 09:11:59 +0300 Subject: [PATCH] VCS: Do not prompt on close if nothing was done MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTCREATORBUG-22233 Change-Id: I1e8240131ccb9a6583a8ae76b3f5c93799f588a5 Reviewed-by: André Hartmann --- src/plugins/vcsbase/submiteditorwidget.cpp | 5 +++++ src/plugins/vcsbase/submiteditorwidget.h | 1 + src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/vcsbase/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp index 4d01d1f549f..4a4b806915d 100644 --- a/src/plugins/vcsbase/submiteditorwidget.cpp +++ b/src/plugins/vcsbase/submiteditorwidget.cpp @@ -645,6 +645,11 @@ bool SubmitEditorWidget::canSubmit(QString *whyNot) const return res; } +bool SubmitEditorWidget::edited() const +{ + return !d->m_description.trimmed().isEmpty() || checkedFilesCount() > 0; +} + void SubmitEditorWidget::setUpdateInProgress(bool value) { d->m_updateInProgress = value; diff --git a/src/plugins/vcsbase/submiteditorwidget.h b/src/plugins/vcsbase/submiteditorwidget.h index 63fd8337104..2f0a8f8a070 100644 --- a/src/plugins/vcsbase/submiteditorwidget.h +++ b/src/plugins/vcsbase/submiteditorwidget.h @@ -67,6 +67,7 @@ public: QList submitFieldWidgets() const; virtual bool canSubmit(QString *whyNot = nullptr) const; + bool edited() const; void setUpdateInProgress(bool value); bool updateInProgress() const; diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 90613a4167f..a11b9b4375c 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -509,7 +509,7 @@ VcsBaseSubmitEditor::PromptSubmitResult Core::EditorManager::activateEditor(this, Core::EditorManager::IgnoreNavigationHistory); - if (!submitWidget->isEnabled()) + if (!submitWidget->isEnabled() || !submitWidget->edited()) return SubmitDiscarded; QString errorMessage;