StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr2982'

Browse Source
This commit is contained in:
tux3 2016-03-12 00:58:24 +01:00
commit 9db1032e1d
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widget/tool/croppinglabel.cpp
View File

@ -41,7 +41,10 @@ CroppingLabel::CroppingLabel(QWidget* parent)
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 +56,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 +164,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)