QgsFilterLineEdit: Hide clear button when read only

m-kuhn · m-kuhn · commit 72a33ea78f97 · 2014-09-23T09:28:34.000+02:00
diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp
@@ -81,15 +81,15 @@ void QgsFilterLineEdit::clear()
 void QgsFilterLineEdit::changeEvent( QEvent *e )
 {
   QLineEdit::changeEvent( e );
-  if ( !isEnabled() )
+  if ( !isEnabled() || isReadOnly() )
     btnClear->setVisible( false );
   else
     btnClear->setVisible( text() != mNullValue );
 }
 
 void QgsFilterLineEdit::onTextChanged( const QString &text )
 {
-  btnClear->setVisible( !isReadOnly() && text != mNullValue );
+  btnClear->setVisible( !isEnabled() && !isReadOnly() && text != mNullValue );
 
   if ( isNull() )
   {

Original file line number	Diff line number	Diff line change
`@@ -81,15 +81,15 @@ void QgsFilterLineEdit::clear()`
`81`	`81`	`void QgsFilterLineEdit::changeEvent( QEvent *e )`
`82`	`82`	`{`
`83`	`83`	`QLineEdit::changeEvent( e );`
`84`		`- if ( !isEnabled() )`
	`84`	`+ if ( !isEnabled() \|\| isReadOnly() )`
`85`	`85`	`btnClear->setVisible( false );`
`86`	`86`	`else`
`87`	`87`	`btnClear->setVisible( text() != mNullValue );`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`void QgsFilterLineEdit::onTextChanged( const QString &text )`
`91`	`91`	`{`
`92`		`- btnClear->setVisible( !isReadOnly() && text != mNullValue );`
	`92`	`+ btnClear->setVisible( !isEnabled() && !isReadOnly() && text != mNullValue );`
`93`	`93`
`94`	`94`	`if ( isNull() )`
`95`	`95`	`{`