selectAll if requested on mouse release

because otherwise the mouse event makes the selectAll useless if it's done on focusEvent cherry-picked from d3c861e
qgis · Oct 30, 2018 · 1777769 · 1777769
1 parent a5981f3
commit 1777769
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/python/gui/auto_generated/qgsfilterlineedit.sip.in b/python/gui/auto_generated/qgsfilterlineedit.sip.in
@@ -268,6 +268,8 @@ Will select all text when this widget receives the focus.
   protected:
     virtual void focusInEvent( QFocusEvent *e );
 
+    virtual void mouseReleaseEvent( QMouseEvent *e );
+
 
 };
 

diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp
@@ -90,6 +90,16 @@ void QgsFilterLineEdit::focusInEvent( QFocusEvent *e )
   if ( e->reason() == Qt::MouseFocusReason && ( isNull() || mSelectOnFocus ) )
   {
     mFocusInEvent = true;
+    mWaitingForMouseRelease = true;
+  }
+}
+
+void QgsFilterLineEdit::mouseReleaseEvent( QMouseEvent *e )
+{
+  QLineEdit::mouseReleaseEvent( e );
+  if ( mWaitingForMouseRelease )
+  {
+    mWaitingForMouseRelease = false;
     selectAll();
   }
 }

diff --git a/src/gui/qgsfilterlineedit.h b/src/gui/qgsfilterlineedit.h
@@ -265,6 +265,7 @@ class GUI_EXPORT QgsFilterLineEdit : public QLineEdit
 
   protected:
     void focusInEvent( QFocusEvent *e ) override;
+    void mouseReleaseEvent( QMouseEvent *e ) override;
 
   private slots:
     void onTextChanged( const QString &text );
@@ -286,6 +287,7 @@ class GUI_EXPORT QgsFilterLineEdit : public QLineEdit
     QString mDefaultValue;
     QString mStyleSheet;
     bool mFocusInEvent = false;
+    bool mWaitingForMouseRelease = false;
     bool mSelectOnFocus = false;
 
     QgsAnimatedIcon *mBusySpinnerAnimatedIcon = nullptr;