Browse Source

fix 2874

when losing focus circle gets renamed unless ESC is pressed
pull/2982/head
Michał Šrajer 10 years ago
parent
commit
04b3276b0f
  1. 8
      src/widget/tool/croppinglabel.cpp

8
src/widget/tool/croppinglabel.cpp

@ -40,8 +40,10 @@ CroppingLabel::CroppingLabel(QWidget* parent)
protected: protected:
void keyPressEvent(QKeyEvent* event) override void keyPressEvent(QKeyEvent* event) override
{ {
if (event->key() == Qt::Key_Escape) if (event->key() == Qt::Key_Escape) {
undo();
clearFocus(); clearFocus();
}
QLineEdit::keyPressEvent(event); QLineEdit::keyPressEvent(event);
} }
@ -53,8 +55,7 @@ CroppingLabel::CroppingLabel(QWidget* parent)
| Qt::ImhNoPredictiveText | Qt::ImhNoPredictiveText
| Qt::ImhPreferLatin); | Qt::ImhPreferLatin);
connect(textEdit, &QLineEdit::returnPressed, this, &CroppingLabel::editingFinished); connect(textEdit, &QLineEdit::editingFinished, this, &CroppingLabel::editingFinished);
connect(textEdit, &QLineEdit::editingFinished, this, &CroppingLabel::hideTextEdit);
} }
void CroppingLabel::editBegin() void CroppingLabel::editBegin()
@ -162,6 +163,7 @@ void CroppingLabel::minimizeMaximumWidth()
void CroppingLabel::editingFinished() void CroppingLabel::editingFinished()
{ {
hideTextEdit();
QString newText = textEdit->text().trimmed().remove(QRegExp("[\\t\\n\\v\\f\\r\\x0000]")); QString newText = textEdit->text().trimmed().remove(QRegExp("[\\t\\n\\v\\f\\r\\x0000]"));
if (origText != newText) if (origText != newText)

Loading…
Cancel
Save