Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/framework/ui/view/abstractnavigation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,7 @@ void AbstractNavigation::setAccessible(AccessibleItem* accessible)

void AbstractNavigation::setAccessibleParent(AccessibleItem* p)
{
if (m_accessible) {
m_accessible->setAccessibleParent(p);
}
accessible()->setAccessibleParent(p);
}

bool AbstractNavigation::highlight() const
Expand Down
12 changes: 7 additions & 5 deletions src/framework/ui/view/navigationcontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ NavigationControl::~NavigationControl()
{
if (m_panel) {
m_panel->removeControl(this);
setAccessibleParent(nullptr);
}
}

Expand All @@ -50,9 +49,8 @@ void NavigationControl::componentComplete()

if (m_panel) {
m_panel->componentComplete();
AbstractNavigation::componentComplete();
}

AbstractNavigation::componentComplete();
}

QString NavigationControl::name() const
Expand Down Expand Up @@ -161,14 +159,18 @@ void NavigationControl::setPanel(NavigationPanel* panel)

m_panel = panel;

setAccessibleParent(m_panel ? m_panel->accessible() : nullptr);

if (m_panel) {
m_panel->addControl(this);
connect(m_panel, &NavigationPanel::destroyed, this, &NavigationControl::onPanelDestroyed);

if (!isComponentCompleted()) {
AbstractNavigation::componentComplete();
}
}

emit panelChanged(m_panel);

setAccessibleParent(m_panel ? m_panel->accessible() : nullptr);
}

void NavigationControl::onPanelDestroyed()
Expand Down
10 changes: 5 additions & 5 deletions src/framework/ui/view/qmlaccessible.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ AccessibleItem::AccessibleItem(QObject* parent)

AccessibleItem::~AccessibleItem()
{
if (m_accessibleParent) {
m_accessibleParent->removeChild(this);
}

QList<AccessibleItem*> children = m_children;
for (AccessibleItem* ch : children) {
ch->setAccessibleParent(nullptr);
Expand All @@ -51,6 +47,10 @@ AccessibleItem::~AccessibleItem()
accessibilityController()->unreg(this);
m_registred = false;
}

if (m_accessibleParent) {
m_accessibleParent->removeChild(this);
}
}

const IAccessible* AccessibleItem::accessibleParent() const
Expand Down Expand Up @@ -501,10 +501,10 @@ void AccessibleItem::setAccessibleParent(AccessibleItem* p)

if (m_accessibleParent) {
m_accessibleParent->addChild(this);
m_accessiblePropertyChanged.send(IAccessible::Property::Parent, Val());
}

emit accessiblePrnChanged();
m_accessiblePropertyChanged.send(IAccessible::Property::Parent, Val());
}

void AccessibleItem::setRole(MUAccessible::Role role)
Expand Down
2 changes: 1 addition & 1 deletion src/framework/ui/view/qmlaccessible.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class AccessibleItem : public QObject, public QQmlParserStatus, public accessibi

Q_INTERFACES(QQmlParserStatus)

Inject<accessibility::IAccessibilityController> accessibilityController = { this };
Inject<accessibility::IAccessibilityController> accessibilityController;

public:
STATE_PROPERTY(enabled, State::Enabled)
Expand Down
Loading