From 23727d2b13507f2e44e1ba3f80a7a0835a191561 Mon Sep 17 00:00:00 2001 From: shun_iwasawa Date: Fri, 24 Nov 2017 21:13:52 +0900 Subject: [PATCH] fix select all on only the first click --- toonz/sources/include/toonzqt/doublefield.h | 6 +++-- toonz/sources/include/toonzqt/intfield.h | 1 + .../sources/tnztools/tooloptionscontrols.cpp | 21 +++++++++++++---- toonz/sources/tnztools/tooloptionscontrols.h | 2 ++ toonz/sources/toonzqt/doublefield.cpp | 23 ++++++++++++------- toonz/sources/toonzqt/intfield.cpp | 12 ++++++---- 6 files changed, 47 insertions(+), 18 deletions(-) diff --git a/toonz/sources/include/toonzqt/doublefield.h b/toonz/sources/include/toonzqt/doublefield.h index 13281b60..2ad8730f 100644 --- a/toonz/sources/include/toonzqt/doublefield.h +++ b/toonz/sources/include/toonzqt/doublefield.h @@ -33,7 +33,10 @@ class DVAPI DoubleValueLineEdit : public LineEdit { Q_OBJECT int m_xMouse; + +protected: bool m_mouseDragEditing = false; + bool m_isTyping = false; public: DoubleValueLineEdit(QWidget *parent = 0) : LineEdit(parent) {} @@ -227,8 +230,7 @@ class DVAPI MeasuredDoubleLineEdit : public DoubleValueLineEdit { int m_errorHighlightingTimerId; int m_decimals; int m_xMouse; - bool m_labelClicked = false; - bool m_mouseDragEditing = false; + bool m_labelClicked = false; public: MeasuredDoubleLineEdit(QWidget *parent = 0); diff --git a/toonz/sources/include/toonzqt/intfield.h b/toonz/sources/include/toonzqt/intfield.h index 70e1820c..7dc45775 100644 --- a/toonz/sources/include/toonzqt/intfield.h +++ b/toonz/sources/include/toonzqt/intfield.h @@ -88,6 +88,7 @@ class DVAPI IntLineEdit : public LineEdit { int m_showedDigits; int m_xMouse; bool m_mouseDragEditing = false; + bool m_isTyping = false; public: IntLineEdit(QWidget *parent = 0, int value = 1, diff --git a/toonz/sources/tnztools/tooloptionscontrols.cpp b/toonz/sources/tnztools/tooloptionscontrols.cpp index c6293fc1..5d822e76 100644 --- a/toonz/sources/tnztools/tooloptionscontrols.cpp +++ b/toonz/sources/tnztools/tooloptionscontrols.cpp @@ -1071,8 +1071,13 @@ void MeasuredValueField::mousePressEvent(QMouseEvent *e) { m_xMouse = e->x(); m_mouseEdit = true; m_originalValue = m_value->getValue(TMeasuredValue::CurrentUnit); - } else + } else { QLineEdit::mousePressEvent(e); + if (!m_isTyping) { // only the first click will select all + selectAll(); + m_isTyping = true; + } + } } //----------------------------------------------------------------------------- @@ -1105,11 +1110,19 @@ void MeasuredValueField::mouseReleaseEvent(QMouseEvent *e) { setText(QString::fromStdWString(m_value->toWideString(m_precision))); emit measuredValueChanged(m_value, true); clearFocus(); - } else { - if (!hasSelectedText()) selectAll(); - } + } else + QLineEdit::mouseReleaseEvent(e); } +//----------------------------------------------------------------------------- + +void MeasuredValueField::focusOutEvent(QFocusEvent *e) { + DVGui::LineEdit::focusOutEvent(e); + m_isTyping = false; +} + +//----------------------------------------------------------------------------- + void MeasuredValueField::receiveMousePress(QMouseEvent *e) { m_labelClicked = true; mousePressEvent(e); diff --git a/toonz/sources/tnztools/tooloptionscontrols.h b/toonz/sources/tnztools/tooloptionscontrols.h index 8acfce96..f9595acd 100644 --- a/toonz/sources/tnztools/tooloptionscontrols.h +++ b/toonz/sources/tnztools/tooloptionscontrols.h @@ -332,6 +332,7 @@ class DVAPI MeasuredValueField : public DVGui::LineEdit { bool m_mouseEdit = false; bool m_labelClicked = false; double m_originalValue; + bool m_isTyping = false; protected: bool m_isGlobalKeyframe; @@ -340,6 +341,7 @@ protected: void mousePressEvent(QMouseEvent *) override; void mouseMoveEvent(QMouseEvent *) override; void mouseReleaseEvent(QMouseEvent *) override; + void focusOutEvent(QFocusEvent *) override; public: MeasuredValueField(QWidget *parent, QString name = "numfield"); diff --git a/toonz/sources/toonzqt/doublefield.cpp b/toonz/sources/toonzqt/doublefield.cpp index 7058a09c..8f5f5c9d 100644 --- a/toonz/sources/toonzqt/doublefield.cpp +++ b/toonz/sources/toonzqt/doublefield.cpp @@ -37,6 +37,7 @@ void DoubleValueLineEdit::focusOutEvent(QFocusEvent *e) { emit editingFinished(); } QLineEdit::focusOutEvent(e); + m_isTyping = false; } //----------------------------------------------------------------------------- @@ -45,8 +46,13 @@ void DoubleValueLineEdit::mousePressEvent(QMouseEvent *e) { if (e->buttons() == Qt::MiddleButton) { m_xMouse = e->x(); m_mouseDragEditing = true; - } else + } else { QLineEdit::mousePressEvent(e); + if (!m_isTyping) { // only the first click will select all + selectAll(); + m_isTyping = true; + } + } } //----------------------------------------------------------------------------- @@ -66,10 +72,8 @@ void DoubleValueLineEdit::mouseReleaseEvent(QMouseEvent *e) { if ((e->buttons() == Qt::NoButton && m_mouseDragEditing)) { m_mouseDragEditing = false; clearFocus(); - } else { - if (!hasSelectedText()) selectAll(); + } else QLineEdit::mouseReleaseEvent(e); - } } //============================================================================= @@ -500,8 +504,13 @@ void MeasuredDoubleLineEdit::mousePressEvent(QMouseEvent *e) { if ((e->buttons() == Qt::MiddleButton) || m_labelClicked) { m_xMouse = e->x(); m_mouseDragEditing = true; - } else + } else { QLineEdit::mousePressEvent(e); + if (!m_isTyping) { // only the first click will select all + selectAll(); + m_isTyping = true; + } + } } //----------------------------------------------------------------------------- @@ -528,10 +537,8 @@ void MeasuredDoubleLineEdit::mouseReleaseEvent(QMouseEvent *e) { m_mouseDragEditing = false; m_labelClicked = false; - } else { - if (!hasSelectedText()) selectAll(); + } else QLineEdit::mouseReleaseEvent(e); - } } void MeasuredDoubleLineEdit::receiveMousePress(QMouseEvent *e) { diff --git a/toonz/sources/toonzqt/intfield.cpp b/toonz/sources/toonzqt/intfield.cpp index 7db07390..1bc4fb87 100644 --- a/toonz/sources/toonzqt/intfield.cpp +++ b/toonz/sources/toonzqt/intfield.cpp @@ -191,6 +191,7 @@ void IntLineEdit::focusOutEvent(QFocusEvent *e) { if (e->lostFocus()) setValue(value); QLineEdit::focusOutEvent(e); + m_isTyping = false; } //----------------------------------------------------------------------------- @@ -211,8 +212,13 @@ void IntLineEdit::mousePressEvent(QMouseEvent *e) { if (e->buttons() == Qt::MiddleButton) { m_xMouse = e->x(); m_mouseDragEditing = true; - } else + } else { QLineEdit::mousePressEvent(e); + if (!m_isTyping) { // only the first click will select all + selectAll(); + m_isTyping = true; + } + } } //----------------------------------------------------------------------------- @@ -231,10 +237,8 @@ void IntLineEdit::mouseReleaseEvent(QMouseEvent *e) { if ((e->buttons() == Qt::NoButton && m_mouseDragEditing)) { m_mouseDragEditing = false; clearFocus(); - } else { - if (!hasSelectedText()) selectAll(); + } else QLineEdit::mouseReleaseEvent(e); - } } //=============================================================================