Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix selection expansion in row/column-only selection modes

Browse Source 
We should never adjust the fixed coordinate of the selection blocks in
this mode, so ensure we never end up with a partially selected line in
this case by preserving the -- correct by construction -- current block
coordinates in this direction.
This commit is contained in:
Vadim Zeitlin
2020-04-12 02:27:50 +02:00
parent 32bb5e9157
commit b10755e553
1 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/gridsel.cpp
View File

@@ -498,6 +498,12 @@ bool wxGridSelection::ExtendOrCreateCurrentBlock(const wxGridCellCoords& blockSt
const wxGridBlockCoords& block = *m_selection.rbegin(); const wxGridBlockCoords& block = *m_selection.rbegin();
wxGridBlockCoords newBlock = block; wxGridBlockCoords newBlock = block;
// Don't adjust the blocks rows at all in column selection mode as the
// top/bottom row are always fixed to the first/last grid row anyhow in
// this case and we shouldn't select only part of a column just because the
// user Shift-clicked somewhere in the middle of the grid.
if ( m_selectionMode != wxGrid::wxGridSelectColumns )
{
// If the new block starts at the same top row as the current one, the // If the new block starts at the same top row as the current one, the
// end block coordinates must correspond to the new bottom row -- and // end block coordinates must correspond to the new bottom row -- and
// vice versa, if the new block starts at the bottom, its other end // vice versa, if the new block starts at the bottom, its other end
@@ -530,8 +536,11 @@ bool wxGridSelection::ExtendOrCreateCurrentBlock(const wxGridCellCoords& blockSt
if ( bottom > newBlock.GetBottomRow() ) if ( bottom > newBlock.GetBottomRow() )
newBlock.SetBottomRow(bottom); newBlock.SetBottomRow(bottom);
} }
}
// Same as above but mirrored for columns. // Same as above but mirrored for columns.
if ( m_selectionMode != wxGrid::wxGridSelectRows )
{
if ( blockStart.GetCol() == block.GetLeftCol() ) if ( blockStart.GetCol() == block.GetLeftCol() )
{ {
newBlock.SetRightCol(blockEnd.GetCol()); newBlock.SetRightCol(blockEnd.GetCol());
@@ -552,6 +561,7 @@ bool wxGridSelection::ExtendOrCreateCurrentBlock(const wxGridCellCoords& blockSt
if ( right > newBlock.GetRightCol() ) if ( right > newBlock.GetRightCol() )
newBlock.SetRightCol(right); newBlock.SetRightCol(right);
} }
}
newBlock = newBlock.Canonicalize(); newBlock = newBlock.Canonicalize();