Small tweaks to selection behavior

qgis · Nov 7, 2017 · 3735c7f · 3735c7f
1 parent 0665080
commit 3735c7f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -644,12 +644,11 @@ void QgsLayoutDesignerDialog::showItemOptions( QgsLayoutItem *item, bool bringPa
   }
 
   std::unique_ptr< QgsLayoutItemBaseWidget > widget( QgsGui::layoutItemGuiRegistry()->createItemWidget( item ) );
+  delete mItemPropertiesStack->takeMainPanel();
+
   if ( ! widget )
-  {
     return;
-  }
 
-  delete mItemPropertiesStack->takeMainPanel();
   widget->setDockMode( true );
   connect( item, &QgsLayoutItem::destroyed, widget.get(), [this]
   {

diff --git a/src/gui/layout/qgslayoutviewtoolselect.cpp b/src/gui/layout/qgslayoutviewtoolselect.cpp
@@ -112,6 +112,10 @@ void QgsLayoutViewToolSelect::layoutPressEvent( QgsLayoutViewMouseEvent *event )
     {
       emit itemFocused( selectedItems.at( 0 ) );
     }
+    else
+    {
+      emit itemFocused( nullptr );
+    }
   }
   else
   {
@@ -173,7 +177,7 @@ void QgsLayoutViewToolSelect::layoutReleaseEvent( QgsLayoutViewMouseEvent *event
   else
   {
     //not adding to or removing from selection, so clear current selection
-    layout()->deselectAll();
+    whileBlocking( layout() )->deselectAll();
   }
 
   //determine item selection mode, default to intersection
@@ -221,6 +225,11 @@ void QgsLayoutViewToolSelect::layoutReleaseEvent( QgsLayoutViewMouseEvent *event
   {
     emit itemFocused( selectedItemList.at( 0 ) );
   }
+  else
+  {
+    emit itemFocused( nullptr );
+  }
+  mMouseHandles->selectionChanged();
 }
 
 void QgsLayoutViewToolSelect::wheelEvent( QWheelEvent *event )