sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-12 00:06:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid temporary no-selection state when selecting a new item

Browse Source 
in layouts using mouse interactions
This commit is contained in:
Nyall Dawson 2017-10-10 17:06:56 +10:00
parent ab4e6c11ed
commit 29dfcc0d7d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/layout/qgslayoutviewtoolselect.cpp
View File

@ -62,11 +62,12 @@ void QgsLayoutViewToolSelect::layoutPressEvent( QgsLayoutViewMouseEvent *event )
QgsLayoutItem *selectedItem = nullptr; QgsLayoutItem *selectedItem = nullptr;
QgsLayoutItem *previousSelectedItem = nullptr; QgsLayoutItem *previousSelectedItem = nullptr;
QList<QgsLayoutItem *> selectedItems = layout()->selectedLayoutItems();
if ( event->modifiers() & Qt::ControlModifier ) if ( event->modifiers() & Qt::ControlModifier )
{ {
//CTRL modifier, so we are trying to select the next item below the current one //CTRL modifier, so we are trying to select the next item below the current one
//first, find currently selected item //first, find currently selected item
QList<QgsLayoutItem *> selectedItems = layout()->selectedLayoutItems();
if ( !selectedItems.isEmpty() ) if ( !selectedItems.isEmpty() )
{ {
previousSelectedItem = selectedItems.at( 0 ); previousSelectedItem = selectedItems.at( 0 );
@ -100,12 +101,6 @@ void QgsLayoutViewToolSelect::layoutPressEvent( QgsLayoutViewMouseEvent *event )
return; return;
} }
if ( ( !selectedItem->isSelected() ) && //keep selection if an already selected item pressed
!( event->modifiers() & Qt::ShiftModifier ) ) //keep selection if shift key pressed
{
layout()->deselectAll();
}
if ( ( event->modifiers() & Qt::ShiftModifier ) && ( selectedItem->isSelected() ) ) if ( ( event->modifiers() & Qt::ShiftModifier ) && ( selectedItem->isSelected() ) )
{ {
//SHIFT-clicking a selected item deselects it //SHIFT-clicking a selected item deselects it
@ -120,7 +115,15 @@ void QgsLayoutViewToolSelect::layoutPressEvent( QgsLayoutViewMouseEvent *event )
} }
else else
{ {
selectedItem->setSelected( true ); if ( ( !selectedItem->isSelected() ) && //keep selection if an already selected item pressed
!( event->modifiers() & Qt::ShiftModifier ) ) //keep selection if shift key pressed
{
layout()->setSelectedItem( selectedItem ); // clears existing selection
}
else
{
selectedItem->setSelected( true );
}
event->ignore(); event->ignore();
emit itemFocused( selectedItem ); emit itemFocused( selectedItem );
} }