selectAll if requested on mouse release

signedav · signedav · commit 17777691f280 · 2018-10-30T08:00:58.000+01:00
because otherwise the mouse event makes the selectAll useless if it's done on focusEvent cherry-picked from d3c861e
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;

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,16 @@ void QgsFilterLineEdit::focusInEvent( QFocusEvent *e )`
`90`	`90`	`if ( e->reason() == Qt::MouseFocusReason && ( isNull() \|\| mSelectOnFocus ) )`
`91`	`91`	`{`
`92`	`92`	`mFocusInEvent = true;`
	`93`	`+ mWaitingForMouseRelease = true;`
	`94`	`+ }`
	`95`	`+}`
	`96`	`+`
	`97`	`+void QgsFilterLineEdit::mouseReleaseEvent( QMouseEvent *e )`
	`98`	`+{`
	`99`	`+ QLineEdit::mouseReleaseEvent( e );`
	`100`	`+ if ( mWaitingForMouseRelease )`
	`101`	`+ {`
	`102`	`+ mWaitingForMouseRelease = false;`
`93`	`103`	`selectAll();`
`94`	`104`	`}`
`95`	`105`	`}`