Clicking the label obstacle QLabel should toggle the checkbox, just l…

…ike a normal checkbox label...
qgis · Sep 1, 2020 · 9e67b05 · 9e67b05
1 parent 4cd40ab
commit 9e67b05
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/gui/labeling/qgslabelinggui.cpp b/src/gui/labeling/qgslabelinggui.cpp
@@ -283,6 +283,8 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer *layer, QgsMapCanvas *mapCanvas,
 
   connect( mCalloutStyleComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsLabelingGui::calloutTypeChanged );
 
+  mLblNoObstacle1->installEventFilter( this );
+
   setLayer( layer );
 }
 
@@ -630,6 +632,21 @@ void QgsLabelingGui::syncDefinedCheckboxFrame( QgsPropertyOverrideButton *ddBtn,
   f->setEnabled( chkBx->isChecked() );
 }
 
+bool QgsLabelingGui::eventFilter( QObject *object, QEvent *event )
+{
+  if ( object == mLblNoObstacle1 )
+  {
+    if ( event->type() == QEvent::MouseButtonPress && dynamic_cast< QMouseEvent * >( event )->button() == Qt::LeftButton )
+    {
+      // clicking the obstacle label toggles the checkbox, just like a "normal" checkbox label...
+      mChkNoObstacle->setChecked( !mChkNoObstacle->isChecked() );
+      return true;
+    }
+    return false;
+  }
+  return QgsTextFormatWidget::eventFilter( object, event );
+}
+
 void QgsLabelingGui::updateUi()
 {
   // enable/disable inline groupbox-like setups (that need to honor data defined setting)

diff --git a/src/gui/labeling/qgslabelinggui.h b/src/gui/labeling/qgslabelinggui.h
@@ -65,6 +65,7 @@ class GUI_EXPORT QgsLabelingGui : public QgsTextFormatWidget
   protected:
     void blockInitSignals( bool block );
     void syncDefinedCheckboxFrame( QgsPropertyOverrideButton *ddBtn, QCheckBox *chkBx, QFrame *f );
+    bool eventFilter( QObject *object, QEvent *event ) override;
 
   private slots: