Fixed partial update on QLineEdit

QLineControl passes a QRect to tell when a partial update is needed.
We used to connect this slot to update. This made the whole lineedit
update when the cursor blinked.

Task-number: QTBUG-12709
Reviewed-by: gabi

3 files changed, 19 insertions, 8 deletions

diff --git a/src/gui/widgets/qlineedit.h b/src/gui/widgets/qlineedit.h
index 9daa94e..b839d91 100644
--- a/src/gui/widgets/qlineedit.h
+++ b/src/gui/widgets/qlineedit.h
@@ -283,6 +283,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_editFocusChange(bool))
 #endif
     Q_PRIVATE_SLOT(d_func(), void _q_selectionChanged())
+    Q_PRIVATE_SLOT(d_func(), void _q_updateNeeded(const QRect &))
 };
 
 #endif // QT_NO_LINEEDIT
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp
index c6ce7da..b7eec30 100644
--- a/src/gui/widgets/qlineedit_p.cpp
+++ b/src/gui/widgets/qlineedit_p.cpp
@@ -59,6 +59,13 @@ QT_BEGIN_NAMESPACE
 const int QLineEditPrivate::verticalMargin(1);
 const int QLineEditPrivate::horizontalMargin(2);
 
+QRect QLineEditPrivate::adjustedControlRect(const QRect &rect) const
+{
+    QRect cr = adjustedContentsRect();
+    int cix = cr.x() - hscroll + horizontalMargin;
+    return rect.translated(QPoint(cix, vscroll));
+}
+
 int QLineEditPrivate::xToPos(int x, QTextLine::CursorPosition betweenOrOn) const
 {
     QRect cr = adjustedContentsRect();
@@ -68,11 +75,7 @@ int QLineEditPrivate::xToPos(int x, QTextLine::CursorPosition betweenOrOn) const
 
 QRect QLineEditPrivate::cursorRect() const
 {
-    QRect cr = adjustedContentsRect();
-    int cix = cr.x() - hscroll + horizontalMargin;
-    QRect crect = control->cursorRect();
-    crect.moveTo(crect.topLeft() + QPoint(cix, vscroll));
-    return crect;
+    return adjustedControlRect(control->cursorRect());
 }
 
 #ifndef QT_NO_COMPLETER
@@ -141,6 +144,11 @@ void QLineEditPrivate::_q_selectionChanged()
     emit q->selectionChanged();
 }
 
+void QLineEditPrivate::_q_updateNeeded(const QRect &rect)
+{
+    q_func()->update(adjustedControlRect(rect));
+}
+
 void QLineEditPrivate::init(const QString& txt)
 {
     Q_Q(QLineEdit);
@@ -176,7 +184,7 @@ void QLineEditPrivate::init(const QString& txt)
             q, SLOT(update()));
 
     QObject::connect(control, SIGNAL(updateNeeded(QRect)),
-            q, SLOT(update()));
+            q, SLOT(_q_updateNeeded(QRect)));
 
     QStyleOptionFrameV2 opt;
     q->initStyleOption(&opt);
@@ -216,9 +224,8 @@ void QLineEditPrivate::setCursorVisible(bool visible)
     if ((bool)cursorVisible == visible)
         return;
     cursorVisible = visible;
-    QRect r = cursorRect();
     if (control->inputMask().isEmpty())
-        q->update(r);
+        q->update(cursorRect());
     else
         q->update();
 }
diff --git a/src/gui/widgets/qlineedit_p.h b/src/gui/widgets/qlineedit_p.h
index c0d2044..519594b 100644
--- a/src/gui/widgets/qlineedit_p.h
+++ b/src/gui/widgets/qlineedit_p.h
@@ -94,6 +94,8 @@ public:
 #endif
     void init(const QString&);
 
+    QRect adjustedControlRect(const QRect &) const;
+
     int xToPos(int x, QTextLine::CursorPosition = QTextLine::CursorBetweenCharacters) const;
     QRect cursorRect() const;
     void setCursorVisible(bool visible);
@@ -129,6 +131,7 @@ public:
     void _q_editFocusChange(bool);
 #endif
     void _q_selectionChanged();
+    void _q_updateNeeded(const QRect &);
 #ifndef QT_NO_COMPLETER
     void _q_completionHighlighted(QString);
 #endif