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

PopupMenu: Expose item ticked state to screen readers

Browse source
This commit is contained in:
reuk 2022-01-04 14:40:02 +00:00
parent 3084a23547
commit 77c24ae49f
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
1 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

34
modules/juce_gui_basics/menus/juce_PopupMenu.cpp
View file

@ -98,9 +98,7 @@ struct HeaderItemComponent : public PopupMenu::CustomComponent
//==============================================================================
struct ItemComponent : public Component
{
ItemComponent (const PopupMenu::Item& i,
const PopupMenu::Options& o,
MenuWindow& parent)
ItemComponent (const PopupMenu::Item& i, const PopupMenu::Options& o, MenuWindow& parent)
: item (i), parentWindow (parent), options (o), customComp (i.customComponent)
{
if (item.isSectionHeader)
@ -189,6 +187,29 @@ struct ItemComponent : public Component
PopupMenu::Item item;
private:
class ValueInterface : public AccessibilityValueInterface
{
public:
ValueInterface() = default;
bool isReadOnly() const override { return true; }
double getCurrentValue() const override
{
return 1.0;
}
String getCurrentValueAsString() const override
{
return TRANS ("Checked");
}
void setValue (double) override {}
void setValueAsString (const String&) override {}
AccessibleValueRange getRange() const override { return {}; }
};
//==============================================================================
class ItemAccessibilityHandler : public AccessibilityHandler
{
@ -197,7 +218,9 @@ private:
: AccessibilityHandler (itemComponentToWrap,
isAccessibilityHandlerRequired (itemComponentToWrap.item) ? AccessibilityRole::menuItem
: AccessibilityRole::ignored,
getAccessibilityActions (*this, itemComponentToWrap)),
getAccessibilityActions (*this, itemComponentToWrap),
AccessibilityHandler::Interfaces { itemComponentToWrap.item.isTicked ? std::make_unique<ValueInterface>()
: nullptr }),
itemComponent (itemComponentToWrap)
{
}
@ -218,6 +241,9 @@ private:
: state.withExpandable().withCollapsed();
}
if (itemComponent.item.isTicked)
state = state.withChecked();
return state.isFocused() ? state.withSelected() : state;
}