From 35d6b4fa6d8ca951299ff0d9aa7f3041e5fb0c82 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 11 Jun 2021 11:12:29 +0100 Subject: [PATCH] Accessibility Demo: Fixed a bug causing the custom widget actions to always be enabled --- examples/GUI/AccessibilityDemo.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/GUI/AccessibilityDemo.h b/examples/GUI/AccessibilityDemo.h index 045e69b472..150c69d0fb 100644 --- a/examples/GUI/AccessibilityDemo.h +++ b/examples/GUI/AccessibilityDemo.h @@ -653,10 +653,10 @@ private: { AccessibilityActions result; - if (press.isEnabled()) result.addAction (AccessibilityActionType::press, [this] { press.onAction(); }); - if (toggle.isEnabled()) result.addAction (AccessibilityActionType::toggle, [this] { toggle.onAction(); }); - if (focus.isEnabled()) result.addAction (AccessibilityActionType::focus, [this] { focus.onAction(); }); - if (showMenu.isEnabled()) result.addAction (AccessibilityActionType::showMenu, [this] { showMenu.onAction(); }); + if (press.isActionEnabled()) result.addAction (AccessibilityActionType::press, [this] { press.onAction(); }); + if (toggle.isActionEnabled()) result.addAction (AccessibilityActionType::toggle, [this] { toggle.onAction(); }); + if (focus.isActionEnabled()) result.addAction (AccessibilityActionType::focus, [this] { focus.onAction(); }); + if (showMenu.isActionEnabled()) result.addAction (AccessibilityActionType::showMenu, [this] { showMenu.onAction(); }); return result; } @@ -702,6 +702,8 @@ private: startTimer (5); } + bool isActionEnabled() const noexcept { return enabledToggle.getToggleState(); } + private: void timerCallback() override {