From 3321ff231dd11a4deabf41c2c30cb0d3f308194c Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 2 Jul 2021 17:23:51 +0100 Subject: [PATCH] Accessibility: Fall back to RowComponent AccessibilityHandler if no custom cell component handler has been set in TableListBox --- .../juce_gui_basics/widgets/juce_TableListBox.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/juce_gui_basics/widgets/juce_TableListBox.cpp b/modules/juce_gui_basics/widgets/juce_TableListBox.cpp index 4f33df2271..6f7d5c2c8d 100644 --- a/modules/juce_gui_basics/widgets/juce_TableListBox.cpp +++ b/modules/juce_gui_basics/widgets/juce_TableListBox.cpp @@ -569,9 +569,15 @@ std::unique_ptr TableListBox::createAccessibilityHandler() const AccessibilityHandler* getCellHandler (int row, int column) const override { - if (isPositiveAndBelow (row, getNumRows()) && isPositiveAndBelow (column, getNumColumns())) - if (auto* cellComponent = tableListBox.getCellComponent (tableListBox.getHeader().getColumnIdOfIndex (column, false), row)) - return cellComponent->getAccessibilityHandler(); + if (isPositiveAndBelow (row, getNumRows())) + { + if (isPositiveAndBelow (column, getNumColumns())) + if (auto* cellComponent = tableListBox.getCellComponent (tableListBox.getHeader().getColumnIdOfIndex (column, false), row)) + return cellComponent->getAccessibilityHandler(); + + if (auto* rowComp = tableListBox.getComponentForRowNumber (row)) + return rowComp->getAccessibilityHandler(); + } return nullptr; }