Ensure that clear button is shown for QgsSpinBox/DoubleSpinBox

nyalldawson · nyalldawson · commit 0cde4f103be1 · 2015-01-19T23:23:59.000+11:00
Previously the clear button might not show if the value of the
widget was set while its signals were blocked.
diff --git a/python/gui/editorwidgets/qgsdoublespinbox.sip b/python/gui/editorwidgets/qgsdoublespinbox.sip
@@ -57,4 +57,5 @@ class QgsDoubleSpinBox : QDoubleSpinBox
   protected:
     virtual void resizeEvent( QResizeEvent* event );
     virtual void changeEvent( QEvent* event );
+    virtual void paintEvent( QPaintEvent* event );
 };
diff --git a/python/gui/editorwidgets/qgsspinbox.sip b/python/gui/editorwidgets/qgsspinbox.sip
@@ -57,4 +57,5 @@ class QgsSpinBox : QSpinBox
   protected:
     virtual void resizeEvent( QResizeEvent* event );
     virtual void changeEvent( QEvent* event );
+    virtual void paintEvent( QPaintEvent* event );
 };
diff --git a/src/gui/editorwidgets/qgsdoublespinbox.cpp b/src/gui/editorwidgets/qgsdoublespinbox.cpp
@@ -63,6 +63,12 @@ void QgsDoubleSpinBox::changeEvent( QEvent *event )
   mClearButton->setVisible( shouldShowClearForValue( value() ) );
 }
 
+void QgsDoubleSpinBox::paintEvent( QPaintEvent *event )
+{
+  mClearButton->setVisible( shouldShowClearForValue( value() ) );
+  QDoubleSpinBox::paintEvent( event );
+}
+
 void QgsDoubleSpinBox::changed( const double& value )
 {
   mClearButton->setVisible( shouldShowClearForValue( value ) );
diff --git a/src/gui/editorwidgets/qgsdoublespinbox.h b/src/gui/editorwidgets/qgsdoublespinbox.h
@@ -82,6 +82,7 @@ class GUI_EXPORT QgsDoubleSpinBox : public QDoubleSpinBox
   protected:
     virtual void resizeEvent( QResizeEvent* event ) override;
     virtual void changeEvent( QEvent* event ) override;
+    virtual void paintEvent( QPaintEvent* event ) override;
 
   private slots:
     void changed( const double &value );
diff --git a/src/gui/editorwidgets/qgsspinbox.cpp b/src/gui/editorwidgets/qgsspinbox.cpp
@@ -63,6 +63,12 @@ void QgsSpinBox::changeEvent( QEvent *event )
   mClearButton->setVisible( shouldShowClearForValue( value() ) );
 }
 
+void QgsSpinBox::paintEvent( QPaintEvent *event )
+{
+  mClearButton->setVisible( shouldShowClearForValue( value() ) );
+  QSpinBox::paintEvent( event );
+}
+
 void QgsSpinBox::changed( const int& value )
 {
   mClearButton->setVisible( shouldShowClearForValue( value ) );
diff --git a/src/gui/editorwidgets/qgsspinbox.h b/src/gui/editorwidgets/qgsspinbox.h
@@ -81,6 +81,7 @@ class GUI_EXPORT QgsSpinBox : public QSpinBox
   protected:
     virtual void resizeEvent( QResizeEvent* event ) override;
     virtual void changeEvent( QEvent* event ) override;
+    virtual void paintEvent( QPaintEvent* event ) override;
 
   private slots:
     void changed( const int& value );

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,12 @@ void QgsDoubleSpinBox::changeEvent( QEvent *event )`
`63`	`63`	`mClearButton->setVisible( shouldShowClearForValue( value() ) );`
`64`	`64`	`}`
`65`	`65`
	`66`	`+void QgsDoubleSpinBox::paintEvent( QPaintEvent *event )`
	`67`	`+{`
	`68`	`+ mClearButton->setVisible( shouldShowClearForValue( value() ) );`
	`69`	`+ QDoubleSpinBox::paintEvent( event );`
	`70`	`+}`
	`71`	`+`
`66`	`72`	`void QgsDoubleSpinBox::changed( const double& value )`
`67`	`73`	`{`
`68`	`74`	`mClearButton->setVisible( shouldShowClearForValue( value ) );`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,12 @@ void QgsSpinBox::changeEvent( QEvent *event )`
`63`	`63`	`mClearButton->setVisible( shouldShowClearForValue( value() ) );`
`64`	`64`	`}`
`65`	`65`
	`66`	`+void QgsSpinBox::paintEvent( QPaintEvent *event )`
	`67`	`+{`
	`68`	`+ mClearButton->setVisible( shouldShowClearForValue( value() ) );`
	`69`	`+ QSpinBox::paintEvent( event );`
	`70`	`+}`
	`71`	`+`
`66`	`72`	`void QgsSpinBox::changed( const int& value )`
`67`	`73`	`{`
`68`	`74`	`mClearButton->setVisible( shouldShowClearForValue( value ) );`