From 0e8756508c05d9ba86f94d92c50f43133fa90a8d Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Tue, 27 Jul 2021 09:13:26 +0200 Subject: [PATCH] VCS: Clear commit message hint when editor becomes disabled The commit editor becomes disabled, when no more changed files were available. In this case, the commit message verification makes no sense and should be removed. Change-Id: Ic16cc4ade1ecd1b64faee52b21a10b9c882908d0 Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/submiteditorwidget.cpp | 12 ++++++++++++ src/plugins/vcsbase/submiteditorwidget.h | 1 + 2 files changed, 13 insertions(+) diff --git a/src/plugins/vcsbase/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp index 14792da7d0d..3c62a7d2732 100644 --- a/src/plugins/vcsbase/submiteditorwidget.cpp +++ b/src/plugins/vcsbase/submiteditorwidget.cpp @@ -435,6 +435,12 @@ void SubmitEditorWidget::updateSubmitAction() } } +void SubmitEditorWidget::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::EnabledChange) + verifyDescription(); +} + // Enable diff depending on selected files void SubmitEditorWidget::updateDiffAction() { @@ -506,6 +512,12 @@ void SubmitEditorWidget::hideDescription() void SubmitEditorWidget::verifyDescription() { + if (!isEnabled()) { + d->m_ui.descriptionHint->setText(QString()); + d->m_ui.descriptionHint->setToolTip(QString()); + return; + } + auto fontColor = [](Utils::Theme::Color color) { return QString("") .arg(Utils::creatorTheme()->color(color).name()); diff --git a/src/plugins/vcsbase/submiteditorwidget.h b/src/plugins/vcsbase/submiteditorwidget.h index ceec8c3d340..70ffeab039b 100644 --- a/src/plugins/vcsbase/submiteditorwidget.h +++ b/src/plugins/vcsbase/submiteditorwidget.h @@ -111,6 +111,7 @@ signals: void submitActionEnabledChanged(bool); protected: + virtual void changeEvent(QEvent *event) override; virtual QString cleanupDescription(const QString &) const; virtual QString commitName() const; void insertTopWidget(QWidget *w);