fixed AccessibilityConfiguration

src/engraving/dom/engravingitem.cpp

@@ -2598,7 +2598,7 @@ void EngravingItem::setVisible(bool f)
 #ifndef ENGRAVING_NO_ACCESSIBILITY
 void EngravingItem::initAccessibleIfNeed()
 {
-    if (!configuration()->isAccessibleEnabled()) {
+    if (!configuration()->isAccessibleEnabled(iocContext())) {
         return;
     }
 

src/engraving/iengravingconfiguration.h

@@ -129,7 +129,7 @@ class IEngravingConfiguration : MODULE_GLOBAL_INTERFACE
     virtual void setDebuggingOptions(const DebuggingOptions& options) = 0;
     virtual muse::async::Notification debuggingOptionsChanged() const = 0;
 
-    virtual bool isAccessibleEnabled() const = 0;
+    virtual bool isAccessibleEnabled(const muse::modularity::ContextPtr& ctx) const = 0;
 
     virtual bool doNotSaveEIDsForBackCompat() const = 0;
     virtual void setDoNotSaveEIDsForBackCompat(bool doNotSave) = 0;

src/engraving/internal/engravingconfiguration.cpp

@@ -430,9 +430,9 @@ muse::async::Notification EngravingConfiguration::debuggingOptionsChanged() cons
     return m_debuggingOptions.notification;
 }
 
-bool EngravingConfiguration::isAccessibleEnabled() const
+bool EngravingConfiguration::isAccessibleEnabled(const muse::modularity::ContextPtr& ctx) const
 {
-    return accessibilityConfiguration() ? accessibilityConfiguration()->enabled() : false;
+    return accessibilityConfiguration() ? accessibilityConfiguration()->enabled(ctx) : false;
 }
 
 bool EngravingConfiguration::doNotSaveEIDsForBackCompat() const

src/engraving/internal/engravingconfiguration.h

@@ -107,7 +107,7 @@ class EngravingConfiguration : public IEngravingConfiguration, public muse::asyn
     void setDebuggingOptions(const DebuggingOptions& options) override;
     muse::async::Notification debuggingOptionsChanged() const override;
 
-    bool isAccessibleEnabled() const override;
+    bool isAccessibleEnabled(const muse::modularity::ContextPtr& ctx) const override;
 
     bool doNotSaveEIDsForBackCompat() const override;
     void setDoNotSaveEIDsForBackCompat(bool doNotSave) override;

src/framework/accessibility/accessibilitymodule.cpp

@@ -42,7 +42,7 @@ std::string AccessibilityModule::moduleName() const
 
 void AccessibilityModule::registerExports()
 {
-    m_configuration = std::make_shared<AccessibilityConfiguration>(globalCtx());
+    m_configuration = std::make_shared<AccessibilityConfiguration>();
 
     globalIoc()->registerExport<IAccessibilityConfiguration>(mname, m_configuration);
     globalIoc()->registerExport<IQAccessibleInterfaceRegister>(mname, new QAccessibleInterfaceRegister());

src/framework/accessibility/iaccessibilityconfiguration.h

@@ -23,6 +23,7 @@
 #define MUSE_ACCESSIBILITY_IACCESSIBILITYCONFIGURATION_H
 
 #include "modularity/imoduleinterface.h"
+#include "modularity/ioc.h"
 
 namespace muse::accessibility {
 class IAccessibilityConfiguration : MODULE_GLOBAL_INTERFACE
@@ -31,7 +32,7 @@ class IAccessibilityConfiguration : MODULE_GLOBAL_INTERFACE
 public:
     virtual ~IAccessibilityConfiguration() = default;
 
-    virtual bool enabled() const = 0;
+    virtual bool enabled(const modularity::ContextPtr& ctx) const = 0;
     virtual bool active() const = 0;
 };
 }

src/framework/accessibility/internal/accessibilityconfiguration.cpp

@@ -23,6 +23,9 @@
 
 #include <QAccessible>
 
+#include "modularity/ioc.h"
+#include "ui/inavigationcontroller.h"
+
 using namespace muse::accessibility;
 
 class AccessibilityActivationObserver : public QAccessible::ActivationObserver
@@ -64,12 +67,14 @@ void AccessibilityConfiguration::init()
     m_inited = true;
 }
 
-bool AccessibilityConfiguration::enabled() const
+bool AccessibilityConfiguration::enabled(const modularity::ContextPtr& ctx) const
 {
     if (!m_inited) {
         return false;
     }
 
+    ContextInject<ui::INavigationController> navigationController { ctx };
+
     if (!navigationController()) {
         return false;
     }

src/framework/accessibility/internal/accessibilityconfiguration.h

@@ -24,23 +24,17 @@
 
 #include "../iaccessibilityconfiguration.h"
 
-#include "modularity/ioc.h"
-#include "ui/inavigationcontroller.h"
-
 namespace muse::accessibility {
-class AccessibilityConfiguration : public IAccessibilityConfiguration, public Contextable
+class AccessibilityConfiguration : public IAccessibilityConfiguration
 {
-    ContextInject<ui::INavigationController> navigationController { this };
-
 public:
-    AccessibilityConfiguration(const modularity::ContextPtr& ctx)
-        : Contextable(ctx) {}
+    AccessibilityConfiguration() = default;
 
     ~AccessibilityConfiguration() override;
 
     void init();
 
-    bool enabled() const override;
+    bool enabled(const modularity::ContextPtr& ctx) const override;
     bool active() const override;
 
 private:

src/framework/accessibility/internal/accessibilitycontroller.cpp

@@ -417,7 +417,7 @@ void AccessibilityController::propertyChanged(IAccessible* item, IAccessible::Pr
 
 void AccessibilityController::stateChanged(IAccessible* aitem, State state, bool arg)
 {
-    if (!configuration()->enabled()) {
+    if (!configuration()->enabled(iocContext())) {
         return;
     }
 

src/framework/global/thirdparty/kors_modularity/modularity/modulesioc.h

@@ -33,8 +33,7 @@
 
 #include "imoduleinterface.h"
 
-// Temporary disabled
-//#define IOC_CHECK_INTERFACE_TYPE
+#define IOC_CHECK_INTERFACE_TYPE
 
 namespace kors::modularity {
 template<class I>
@@ -307,7 +306,7 @@
     template<class I>
     std::shared_ptr<I> resolve(const std::string_view& module)
     {
         static_assert(I::modularity_isGlobalInterface(), "The interface must be global.");
         std::shared_ptr<IModuleInterface> p = doResolvePtrByInfo(module, I::modularity_interfaceInfo());
         return pointer_cast<I>(p);
     }

src/project/internal/projectconfiguration.cpp

@@ -621,9 +621,9 @@ muse::io::path_t ProjectConfiguration::newProjectTemporaryPath() const
     return globalConfiguration()->userAppDataPath() + "/new_project" + DEFAULT_FILE_SUFFIX;
 }
 
-bool ProjectConfiguration::isAccessibleEnabled() const
+bool ProjectConfiguration::isAccessibleEnabled(const muse::modularity::ContextPtr& ctx) const
 {
-    return accessibilityConfiguration()->enabled();
+    return accessibilityConfiguration()->enabled(ctx);
 }
 
 bool ProjectConfiguration::shouldDestinationFolderBeOpenedOnExport() const

src/project/internal/projectconfiguration.h

@@ -129,7 +129,7 @@ class ProjectConfiguration : public IProjectConfiguration, public muse::Contexta
 
     muse::io::path_t newProjectTemporaryPath() const override;
 
-    bool isAccessibleEnabled() const override;
+    bool isAccessibleEnabled(const muse::modularity::ContextPtr& ctx) const override;
 
     bool shouldDestinationFolderBeOpenedOnExport() const override;
     void setShouldDestinationFolderBeOpenedOnExport(bool shouldDestinationFolderBeOpenedOnExport) override;

src/project/iprojectconfiguration.h

@@ -132,7 +132,7 @@ class IProjectConfiguration : MODULE_GLOBAL_INTERFACE
 
     virtual muse::io::path_t newProjectTemporaryPath() const = 0;
 
-    virtual bool isAccessibleEnabled() const = 0;
+    virtual bool isAccessibleEnabled(const muse::modularity::ContextPtr& ctx) const = 0;
 
     virtual bool shouldDestinationFolderBeOpenedOnExport() const = 0;
     virtual void setShouldDestinationFolderBeOpenedOnExport(bool shouldDestinationFolderBeOpenedOnExport) = 0;