From 04b3276b0f7245a8b588a67d70311f7778566b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=A0rajer?= Date: Sun, 28 Feb 2016 18:09:53 +0100 Subject: [PATCH] fix 2874 when losing focus circle gets renamed unless ESC is pressed --- src/widget/tool/croppinglabel.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/widget/tool/croppinglabel.cpp b/src/widget/tool/croppinglabel.cpp index 4d9e589db..7b20ec789 100644 --- a/src/widget/tool/croppinglabel.cpp +++ b/src/widget/tool/croppinglabel.cpp @@ -40,8 +40,10 @@ CroppingLabel::CroppingLabel(QWidget* parent) protected: void keyPressEvent(QKeyEvent* event) override { - if (event->key() == Qt::Key_Escape) + if (event->key() == Qt::Key_Escape) { + undo(); clearFocus(); + } QLineEdit::keyPressEvent(event); } @@ -53,8 +55,7 @@ CroppingLabel::CroppingLabel(QWidget* parent) | Qt::ImhNoPredictiveText | Qt::ImhPreferLatin); - connect(textEdit, &QLineEdit::returnPressed, this, &CroppingLabel::editingFinished); - connect(textEdit, &QLineEdit::editingFinished, this, &CroppingLabel::hideTextEdit); + connect(textEdit, &QLineEdit::editingFinished, this, &CroppingLabel::editingFinished); } void CroppingLabel::editBegin() @@ -162,6 +163,7 @@ void CroppingLabel::minimizeMaximumWidth() void CroppingLabel::editingFinished() { + hideTextEdit(); QString newText = textEdit->text().trimmed().remove(QRegExp("[\\t\\n\\v\\f\\r\\x0000]")); if (origText != newText)