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

Fix returning duplicates from Get{Row,Col}Selection()

Browse Source 
The "unique" rows/columns arrays used in the implementation of these
functions were not unique at all, as we happily added duplicates of the
existing items into them. Fix this by checking that a row/column is not
already present before adding it.

Add a (previously failing) unit test checking that this works correctly
with overlapping selected blocks.
This commit is contained in:
Vadim Zeitlin
2020-05-26 16:32:05 +02:00
parent f268c02c19
commit 92b6a55fd6
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/gridsel.cpp
View File

@@ -749,7 +749,8 @@ wxArrayInt wxGridSelection::GetRowSelection() const
{
for ( int r = block.GetTopRow(); r <= block.GetBottomRow(); ++r )
{
uniqueRows.Add(r);
if ( uniqueRows.Index(r) == wxNOT_FOUND )
uniqueRows.Add(r);
}
}
}
@@ -779,7 +780,8 @@ wxArrayInt wxGridSelection::GetColSelection() const
{
for ( int c = block.GetLeftCol(); c <= block.GetRightCol(); ++c )
{
uniqueCols.Add(c);
if ( uniqueCols.Index(c) == wxNOT_FOUND )
uniqueCols.Add(c);
}
}
}

6
tests/controls/gridtest.cpp
View File

@@ -901,6 +901,12 @@ TEST_CASE_METHOD(GridTestCase, "Grid::SelectionMode", "[grid]")
CHECK(selectedRows.Count() == 1);
CHECK(selectedRows[0] == 3);
// Check that overlapping selection blocks are handled correctly.
m_grid->ClearSelection();
m_grid->SelectBlock(0, 0, 4, 1);
m_grid->SelectBlock(2, 0, 6, 1, true /* add to selection */);
CHECK( m_grid->GetSelectedRows().size() == 7 );
CHECK(m_grid->GetSelectionMode() == wxGrid::wxGridSelectRows);