solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'generic-listctrl-fix-missing-deselection' of https://github.com/taler21/wxWidgets

Browse source 
Fix missing deselection of single selected but not focused item in
wxGenericListCtrl.

See #24343.
This commit is contained in:
Vadim Zeitlin 2024-02-25 00:23:38 +01:00
commit fc357a49ef
2 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/generic/listctrl.cpp
View file

@ -2220,7 +2220,10 @@ void wxListMainWindow::HighlightOnly( size_t line, size_t oldLine )
: RefreshLine(oldLine); // refresh the old focus to remove it : RefreshLine(oldLine); // refresh the old focus to remove it
} }
if ( selCount > 1 ) // multiple-selection only // Deselect the remaining items we may have when using multiple selection
// (for single selection the only selected item is always the highlighted
// one, so we would have already returned above).
if ( selCount != 0 )
{ {
// Deselecting many items at once will generate wxEVT_XXX_DESELECTED event // Deselecting many items at once will generate wxEVT_XXX_DESELECTED event
// for each one of them. although this may be inefficient if the number of // for each one of them. although this may be inefficient if the number of

37
tests/controls/listbasetest.cpp
View file

@ -179,12 +179,12 @@ void ListBaseTestCase::MultiSelect()
{ {
#if wxUSE_UIACTIONSIMULATOR #if wxUSE_UIACTIONSIMULATOR
#ifndef __WXMSW__ #if defined(__WXGTK__) && !defined(__WXGTK3__)
// FIXME: This test fails on Travis CI although works fine on // FIXME: This test fails on GitHub CI under wxGTK2 although works fine on
// development machine, no idea why though! // development machine, no idea why though!
if ( IsAutomaticTest() ) if ( IsAutomaticTest() )
return; return;
#endif // !__WXMSW__ #endif // wxGTK2
wxListCtrl* const list = GetList(); wxListCtrl* const list = GetList();
@ -273,6 +273,37 @@ void ListBaseTestCase::MultiSelect()
CPPUNIT_ASSERT_EQUAL(1, focused.GetCount()); // because the focus changed from item 0 to anchor CPPUNIT_ASSERT_EQUAL(1, focused.GetCount()); // because the focus changed from item 0 to anchor
CPPUNIT_ASSERT_EQUAL(0, selected.GetCount()); // anchor is already in selection state CPPUNIT_ASSERT_EQUAL(0, selected.GetCount()); // anchor is already in selection state
CPPUNIT_ASSERT_EQUAL(2, deselected.GetCount()); // items 0 and 1 are deselected CPPUNIT_ASSERT_EQUAL(2, deselected.GetCount()); // items 0 and 1 are deselected
focused.Clear();
selected.Clear();
deselected.Clear();
list->GetItemRect(3, pos);
point = list->ClientToScreen(pos.GetPosition()) + wxPoint(10, 10);
// select and deselect item 3 while leaving item 2 selected
for ( int i = 0; i < 2; ++i )
{
sim.MouseMove(point + wxPoint(i*10, 0));
wxYield();
sim.KeyDown(WXK_CONTROL);
sim.MouseClick();
sim.KeyUp(WXK_CONTROL);
wxYield();
}
// select only item 3
sim.MouseMove(point);
wxYield();
sim.MouseClick();
wxYield();
CPPUNIT_ASSERT_EQUAL(1, list->GetSelectedItemCount()); // item 3 is the only selected item
CPPUNIT_ASSERT_EQUAL(1, focused.GetCount()); // because the focus changed from anchor to item 3
CPPUNIT_ASSERT_EQUAL(2, selected.GetCount()); // item 3 was selected twice
CPPUNIT_ASSERT_EQUAL(2, deselected.GetCount()); // anchor and item 3 were each deselected once
#endif // wxUSE_UIACTIONSIMULATOR #endif // wxUSE_UIACTIONSIMULATOR
} }