Small tweaks to selection behavior

nyalldawson · nyalldawson · commit 3735c7f06f5c · 2017-11-07T11:32:37.000+10:00
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 )

Original file line number	Diff line number	Diff line change
`@@ -644,12 +644,11 @@ void QgsLayoutDesignerDialog::showItemOptions( QgsLayoutItem *item, bool bringPa`
`644`	`644`	`}`
`645`	`645`
`646`	`646`	`std::unique_ptr< QgsLayoutItemBaseWidget > widget( QgsGui::layoutItemGuiRegistry()->createItemWidget( item ) );`
	`647`	`+ delete mItemPropertiesStack->takeMainPanel();`
	`648`	`+`
`647`	`649`	`if ( ! widget )`
`648`		`- {`
`649`	`650`	`return;`
`650`		`- }`
`651`	`651`
`652`		`- delete mItemPropertiesStack->takeMainPanel();`
`653`	`652`	`widget->setDockMode( true );`
`654`	`653`	`connect( item, &QgsLayoutItem::destroyed, widget.get(), [this]`
`655`	`654`	`{`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,10 @@ void QgsLayoutViewToolSelect::layoutPressEvent( QgsLayoutViewMouseEvent *event )`
`112`	`112`	`{`
`113`	`113`	`emit itemFocused( selectedItems.at( 0 ) );`
`114`	`114`	`}`
	`115`	`+ else`
	`116`	`+ {`
	`117`	`+ emit itemFocused( nullptr );`
	`118`	`+ }`
`115`	`119`	`}`
`116`	`120`	`else`
`117`	`121`	`{`
`@@ -173,7 +177,7 @@ void QgsLayoutViewToolSelect::layoutReleaseEvent( QgsLayoutViewMouseEvent *event`
`173`	`177`	`else`
`174`	`178`	`{`
`175`	`179`	`//not adding to or removing from selection, so clear current selection`
`176`		`- layout()->deselectAll();`
	`180`	`+ whileBlocking( layout() )->deselectAll();`
`177`	`181`	`}`
`178`	`182`
`179`	`183`	`//determine item selection mode, default to intersection`
`@@ -221,6 +225,11 @@ void QgsLayoutViewToolSelect::layoutReleaseEvent( QgsLayoutViewMouseEvent *event`
`221`	`225`	`{`
`222`	`226`	`emit itemFocused( selectedItemList.at( 0 ) );`
`223`	`227`	`}`
	`228`	`+ else`
	`229`	`+ {`
	`230`	`+ emit itemFocused( nullptr );`
	`231`	`+ }`
	`232`	`+ mMouseHandles->selectionChanged();`
`224`	`233`	`}`
`225`	`234`
`226`	`235`	`void QgsLayoutViewToolSelect::wheelEvent( QWheelEvent *event )`