mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Accessibility: Fixed ListBox multiple selection

Browse source
This commit is contained in:
ed 2021-05-20 17:53:39 +01:00
parent b6bb2f4882
commit f3aa49e0d3
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/juce_gui_basics/widgets/juce_ListBox.cpp
View file

@ -26,27 +26,24 @@
namespace juce
{
template<typename RowHandlerType, typename RowComponent>
static AccessibilityActions getListRowAccessibilityActions (RowHandlerType& handler, RowComponent& rowComponent)
template<typename RowComponentType>
static AccessibilityActions getListRowAccessibilityActions (RowComponentType& rowComponent)
{
auto onFocus = [&rowComponent]
{
rowComponent.owner.scrollToEnsureRowIsOnscreen (rowComponent.row);
rowComponent.owner.selectRow (rowComponent.row);
};
auto onPress = [&rowComponent, onFocus]
{
onFocus();
rowComponent.owner.selectRow (rowComponent.row);
rowComponent.owner.keyPressed (KeyPress (KeyPress::returnKey));
};
auto onToggle = [&handler, &rowComponent, onFocus]
auto onToggle = [&rowComponent]
{
if (handler.getCurrentState().isSelected())
rowComponent.owner.deselectRow (rowComponent.row);
else
onFocus();
rowComponent.owner.flipRowSelection (rowComponent.row);
};
return AccessibilityActions().addAction (AccessibilityActionType::focus, std::move (onFocus))
@ -199,7 +196,7 @@ public:
explicit RowAccessibilityHandler (RowComponent& rowComponentToWrap)
: AccessibilityHandler (rowComponentToWrap,
AccessibilityRole::listItem,
getListRowAccessibilityActions (*this, rowComponentToWrap)),
getListRowAccessibilityActions (rowComponentToWrap)),
rowComponent (rowComponentToWrap)
{
}
@ -298,6 +295,9 @@ public:
if (auto* m = owner.getModel())
m->listWasScrolled();
if (auto* handler = owner.getAccessibilityHandler())
handler->notifyAccessibilityEvent (AccessibilityEvent::structureChanged);
}
void updateVisibleArea (const bool makeSureItUpdatesContent)

2
modules/juce_gui_basics/widgets/juce_TableListBox.cpp
View file

@ -235,7 +235,7 @@ public:
RowAccessibilityHandler (RowComp& rowComp)
: AccessibilityHandler (rowComp,
AccessibilityRole::row,
getListRowAccessibilityActions (*this, rowComp),
getListRowAccessibilityActions (rowComp),
{ std::make_unique<RowComponentCellInterface> (*this) }),
rowComponent (rowComp)
{