Skip to content

Commit 9768fdd

Browse files
committed
handle EnableChange event in QgsFilterLineEdit
1 parent a4bb905 commit 9768fdd

File tree

4 files changed

+1
-14
lines changed

4 files changed

+1
-14
lines changed

python/gui/auto_generated/qgsfeaturelistcombobox.sip.in

-3
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ The index of the currently selected item.
125125
virtual void keyPressEvent( QKeyEvent *event );
126126

127127

128-
virtual bool event( QEvent *event );
129-
130-
131128
signals:
132129

133130
void modelUpdated();

src/gui/qgsfeaturelistcombobox.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,6 @@ void QgsFeatureListComboBox::keyPressEvent( QKeyEvent *event )
203203
QComboBox::keyReleaseEvent( event );
204204
}
205205

206-
bool QgsFeatureListComboBox::event( QEvent *event )
207-
{
208-
if ( event->type() == QEvent::EnabledChange )
209-
mLineEdit->setShowClearButton( true );
210-
211-
return QComboBox::event( event );
212-
}
213-
214206
bool QgsFeatureListComboBox::allowNull() const
215207
{
216208
return mModel->allowNull();

src/gui/qgsfeaturelistcombobox.h

-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@ class GUI_EXPORT QgsFeatureListComboBox : public QComboBox
147147

148148
void keyPressEvent( QKeyEvent *event ) override;
149149

150-
bool event( QEvent *event ) override;
151-
152150
signals:
153151

154152
/**

src/gui/qgsfilterlineedit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ bool QgsFilterLineEdit::shouldShowClear() const
208208

209209
bool QgsFilterLineEdit::event( QEvent *event )
210210
{
211-
if ( event->type() == QEvent::ReadOnlyChange )
211+
if ( event->type() == QEvent::ReadOnlyChange || event->type() == QEvent::EnabledChange )
212212
updateClearIcon();
213213

214214
return QLineEdit::event( event );;

0 commit comments

Comments
 (0)