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

WebBrowserComponent: iOS: Add accessibility integration

Browse source
This commit is contained in:
attila 2023-04-27 15:27:31 +02:00 • committed by Attila Szarvas
parent f519af3b62
commit 18489bb7d7
4 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/juce_gui_basics/native/accessibility/juce_Accessibility_ios.mm
View file

@ -277,7 +277,8 @@ private:
if (handler->getComponent().isOnDesktop()) if (handler->getComponent().isOnDesktop())
return static_cast<id> (handler->getComponent().getWindowHandle()); return static_cast<id> (handler->getComponent().getWindowHandle());
if (! handler->getChildren().empty()) if ( ! handler->getChildren().empty()
|| AccessibilityHandler::getNativeChildForComponent (handler->getComponent()) != nullptr)
{ {
if (UIAccessibilityElement* container = getContainer (self)) if (UIAccessibilityElement* container = getContainer (self))
return container; return container;

22
modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm
View file

@ -56,19 +56,31 @@ static NSArray* getContainerAccessibilityElements (AccessibilityHandler& handler
{ {
id accessibleElement = [&childHandler] id accessibleElement = [&childHandler]
{ {
id native = static_cast<id> (childHandler->getNativeImplementation()); id nativeChild = static_cast<id> (childHandler->getNativeImplementation());
if (! childHandler->getChildren().empty()) if ( ! childHandler->getChildren().empty()
return [native accessibilityContainer]; || AccessibilityHandler::getNativeChildForComponent (childHandler->getComponent()) != nullptr)
{
return [nativeChild accessibilityContainer];
}
return native; return nativeChild;
}(); }();
if (accessibleElement != nil) if (accessibleElement != nil)
[accessibleChildren addObject: accessibleElement]; [accessibleChildren addObject: accessibleElement];
} }
[accessibleChildren addObject: static_cast<id> (handler.getNativeImplementation())]; id nativeHandler = static_cast<id> (handler.getNativeImplementation());
if (auto* view = static_cast<UIView*> (AccessibilityHandler::getNativeChildForComponent (handler.getComponent())))
{
[static_cast<UIAccessibilityElement*> (view) setAccessibilityContainer: [nativeHandler accessibilityContainer]];
[accessibleChildren addObject: view];
}
[accessibleChildren addObject: nativeHandler];
return accessibleChildren; return accessibleChildren;
} }

2
modules/juce_gui_extra/embedding/juce_UIViewComponent.h
View file

@ -74,6 +74,8 @@ public:
//============================================================================== //==============================================================================
/** @internal */ /** @internal */
void paint (Graphics&) override; void paint (Graphics&) override;
/** @internal */
std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
private: private:

12
modules/juce_gui_extra/native/juce_UIViewComponent_ios.mm
View file

@ -103,7 +103,10 @@ private:
//============================================================================== //==============================================================================
UIViewComponent::UIViewComponent() {} UIViewComponent::UIViewComponent() {}
UIViewComponent::~UIViewComponent() {} UIViewComponent::~UIViewComponent()
{
AccessibilityHandler::setNativeChildForComponent (*this, nullptr);
}
void UIViewComponent::setView (void* view) void UIViewComponent::setView (void* view)
{ {
@ -113,6 +116,8 @@ void UIViewComponent::setView (void* view)
if (view != nullptr) if (view != nullptr)
pimpl.reset (new Pimpl ((UIView*) view, *this)); pimpl.reset (new Pimpl ((UIView*) view, *this));
AccessibilityHandler::setNativeChildForComponent (*this, getView());
} }
} }
@ -129,4 +134,9 @@ void UIViewComponent::resizeToFitView()
void UIViewComponent::paint (Graphics&) {} void UIViewComponent::paint (Graphics&) {}
std::unique_ptr<AccessibilityHandler> UIViewComponent::createAccessibilityHandler()
{
return std::make_unique<AccessibilityHandler> (*this, AccessibilityRole::group);
}
} // namespace juce } // namespace juce