sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

don't close popup after first click, so user can select all necessary

Browse Source 
options at once
This commit is contained in:
Alexander Bruy 2017-04-07 10:05:23 +03:00
parent 9fbb31a31c
commit 1e3baca361
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/qgscheckablecombobox.cpp
View File

@ -169,10 +169,11 @@ void QgsCheckableComboBox::toggleItemCheckState( int index )
void QgsCheckableComboBox::hidePopup() void QgsCheckableComboBox::hidePopup()
{ {
if ( !view()->underMouse() ) if ( !mSkipHide )
{ {
QComboBox::hidePopup(); QComboBox::hidePopup();
} }
mSkipHide = false;
} }
void QgsCheckableComboBox::showContextMenu( const QPoint &pos ) void QgsCheckableComboBox::showContextMenu( const QPoint &pos )
@ -206,7 +207,11 @@ void QgsCheckableComboBox::deselectAllOptions()
bool QgsCheckableComboBox::eventFilter( QObject *object, QEvent *event ) bool QgsCheckableComboBox::eventFilter( QObject *object, QEvent *event )
{ {
Q_UNUSED( object ); if ( ( event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonRelease )
&& object == view()->viewport() )
{
mSkipHide = true;
}
if ( event->type() == QEvent::MouseButtonRelease ) if ( event->type() == QEvent::MouseButtonRelease )
{ {

2
src/gui/qgscheckablecombobox.h
View File

@ -227,6 +227,8 @@ class GUI_EXPORT QgsCheckableComboBox : public QComboBox
QString mSeparator; QString mSeparator;
QString mDefaultText; QString mDefaultText;
bool mSkipHide = false;
QMenu *mContextMenu = nullptr; QMenu *mContextMenu = nullptr;
QAction *mSelectAllAction = nullptr; QAction *mSelectAllAction = nullptr;
QAction *mDeselectAllAction = nullptr; QAction *mDeselectAllAction = nullptr;