Skip to content

Commit 4c38fc2

Browse files
committed
Announce logs and debug state changes
1 parent 41f1bee commit 4c38fc2

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

src/gui/Src/Accessible/AccessibleAbstractTableViewCellTitle.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ QAccessible::State AccessibleAbstractTableViewCellTitle::state() const
3636
state.selected = false;
3737
state.focused = false;
3838
state.readOnly = true;
39+
state.invisible = mParent->getTable()->getHeaderHeight() == 0;
3940
return state;
4041
}
4142

src/gui/Src/Accessible/AccessibleRegistersView.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,14 @@ QAccessible::Role AccessibleRegistersViewItem::role() const
6969
QAccessible::State AccessibleRegistersViewItem::state() const
7070
{
7171
QAccessible::State state;
72-
state.focusable = mParent->m_registersView->isActive;
73-
state.active = mParent->m_registersView->isActive;
74-
state.selectable = mParent->m_registersView->isActive;
75-
if(mParent->m_registersView->mSelected == id)
72+
const RegistersView* parent = mParent->m_registersView;
73+
state.focusable = parent->isActive;
74+
state.active = parent->isActive;
75+
state.selectable = parent->isActive;
76+
if(parent->mSelected == id)
7677
{
7778
state.selected = true;
78-
if(mParent->m_registersView->hasFocus())
79+
if(parent->hasFocus())
7980
state.focused = true;
8081
}
8182
return state;

src/gui/Src/Gui/DebugStatusLabel.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "DebugStatusLabel.h"
2+
#include <QAccessible>
23
#include <QTextDocument>
34
#include <QStyle>
45
#include <QMetaEnum>
@@ -45,4 +46,11 @@ void DebugStatusLabel::debugStateChangedSlot(DBGSTATE state)
4546
this->style()->unpolish(this);
4647
this->style()->polish(this);
4748
this->update();
49+
50+
// Send accesibility events
51+
if(QAccessible::isActive())
52+
{
53+
QAccessibleValueChangeEvent updateEvent(this, mStatusTexts[state]);
54+
QAccessible::updateAccessibility(&updateEvent);
55+
}
4856
}

src/gui/Src/Gui/LogStatusLabel.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#include "LogStatusLabel.h"
22
#include "LogView.h"
33
#include <QTextDocument>
4+
#include <QTextDocumentFragment>
45
#include <QApplication>
56
#include <QStatusBar>
7+
#include <QAccessible>
68

79
LogStatusLabel::LogStatusLabel(QStatusBar* parent) : QLabel(parent)
810
{
@@ -43,6 +45,12 @@ void LogStatusLabel::logUpdate(QString message, bool encodeHTML)
4345
}
4446
}
4547
setText(finalLabel);
48+
// Send accesibility events
49+
if(QAccessible::isActive())
50+
{
51+
QAccessibleValueChangeEvent updateEvent(this, QTextDocumentFragment::fromHtml(finalLabel).toPlainText());
52+
QAccessible::updateAccessibility(&updateEvent);
53+
}
4654
}
4755

4856
void LogStatusLabel::logUpdateUtf8(QByteArray message)

0 commit comments

Comments
 (0)