Fixing AccessibleRegistersView

Author: torusrxxx

src/gui/Src/Accessible/Accessible.h

@@ -1,3 +1,4 @@
+#pragma once
 #include "AccessibleRegistersView.h"
 
 QAccessibleInterface* accessibleInterfaceFactory(const QString & classname, QObject* object);

src/gui/Src/Accessible/AccessibleRegistersView.cpp

@@ -2,16 +2,10 @@
 #ifndef QT_NO_ACCESSIBILITY
 #include "AccessibleRegistersView.h"
 
-AccessibleRegistersViewItem::AccessibleRegistersViewItem() : mParent(nullptr), id(RegistersView::REGISTER_NAME::CAX)
+AccessibleRegistersViewItem::AccessibleRegistersViewItem(AccessibleRegistersView* parent, RegistersView::REGISTER_NAME id) : mParent(parent), id(id)
 {
 }
 
-void AccessibleRegistersViewItem::setRegistersView(AccessibleRegistersView* parent, int id)
-{
-    this->mParent = parent;
-    this->id = (RegistersView::REGISTER_NAME)id;
-}
-
 QString AccessibleRegistersViewItem::text(QAccessible::Text t) const
 {
     RegistersView* w = mParent->m_registersView;
@@ -20,8 +14,8 @@ QString AccessibleRegistersViewItem::text(QAccessible::Text t) const
     case QAccessible::Name:
     case QAccessible::Value:
         if(w->mLABELDISPLAY.contains(id))
-            return QString(w->mRegisterMapping[id]) + " = " + w->GetRegStringValueFromValue(w->mSelected, w->registerValue(&w->mRegDumpStruct, w->mSelected)) + ' ' + w->getRegisterLabel(id);
-        return QString(w->mRegisterMapping[id]) + " = " + w->GetRegStringValueFromValue(w->mSelected, w->registerValue(&w->mRegDumpStruct, w->mSelected));
+            return QString(w->mRegisterMapping[id]) + " = " + w->GetRegStringValueFromValue(id, w->registerValue(&w->mRegDumpStruct, id)) + ' ' + w->getRegisterLabel(id);
+        return QString(w->mRegisterMapping[id]) + " = " + w->GetRegStringValueFromValue(id, w->registerValue(&w->mRegDumpStruct, id));
     case QAccessible::Help:
         return w->helpRegister(id);
     default:
@@ -53,7 +47,7 @@ QWindow* AccessibleRegistersViewItem::window() const
 
 QAccessibleInterface* AccessibleRegistersViewItem::parent() const
 {
-    return dynamic_cast<QAccessibleInterface*>(mParent);
+    return mParent;
 }
 
 QAccessibleInterface* AccessibleRegistersViewItem::child(int index) const
@@ -142,8 +136,7 @@ QAccessibleInterface* AccessibleRegistersView::child(int index) const
         }
         else
         {
-            auto child = new AccessibleRegistersViewItem();
-            child->setRegistersView(const_cast<AccessibleRegistersView*>(this), index);
+            auto child = new AccessibleRegistersViewItem(const_cast<AccessibleRegistersView*>(this), (RegistersView::REGISTER_NAME)index);
             interfaces[index] = QAccessible::registerAccessibleInterface(child);
             return child;
         }
@@ -164,7 +157,10 @@ QAccessibleInterface* AccessibleRegistersView::childAt(int x, int y) const
 
 QAccessibleInterface* AccessibleRegistersView::focusChild() const
 {
-    return child(m_registersView->mSelected);
+    if(m_registersView->mSelected < RegistersView::UNKNOWN)
+        return child(m_registersView->mSelected);
+    else
+        return (QAccessibleInterface*)this;
 }
 
 bool AccessibleRegistersView::isValid() const

src/gui/Src/Accessible/AccessibleRegistersView.h

@@ -2,7 +2,7 @@
 #ifndef QT_NO_ACCESSIBILITY
 #include <array>
 #include <QAccessibleWidget>
-#include "../Gui/RegistersView.h"
+#include "Gui/RegistersView.h"
 
 class AccessibleRegistersView;
 
@@ -11,8 +11,7 @@ class AccessibleRegistersViewItem : public QAccessibleInterface
     RegistersView::REGISTER_NAME id;
     AccessibleRegistersView* mParent;
 public:
-    AccessibleRegistersViewItem();
-    void setRegistersView(AccessibleRegistersView* parent, int id);
+    AccessibleRegistersViewItem(AccessibleRegistersView* parent, RegistersView::REGISTER_NAME id);
 
     QString text(QAccessible::Text t) const override;
     QColor foregroundColor() const override;
@@ -40,7 +39,7 @@ class AccessibleRegistersView : public QAccessibleWidget
     ~AccessibleRegistersView();
     int childCount() const override;
     QAccessibleInterface* child(int index) const override;
-    QAccessibleInterface* QAccessibleInterface::childAt(int x, int y) const override;
+    QAccessibleInterface* childAt(int x, int y) const override;
     QAccessibleInterface* focusChild() const override;
     bool isValid() const override;
     QAccessible::Role role() const override;

src/gui/Src/Gui/CPURegistersView.cpp

@@ -1,5 +1,4 @@
 #include <QListWidget>
-#include <QAccessibleEvent>
 #include "MiscUtil.h"
 #include "CPUWidget.h"
 #include "CPUDisassembly.h"

src/gui/Src/Gui/RegistersView.cpp

@@ -3368,7 +3368,7 @@ void RegistersView::accessibilitySelectionChanged()
         else
         {
             QAccessibleEvent focusEvent(static_cast<RegistersView*>(this), QAccessible::Focus);
-            QAccessible::updateAccessibility(&updateEvent);
+            QAccessible::updateAccessibility(&focusEvent);
         }
     }
 }

src/gui/Src/main.cpp

@@ -11,7 +11,7 @@
 #include <QDir>
 #include "MiscUtil.h"
 #include <dwmapi.h>
-#include "../Accessible/Accessible.h"
+#include "Accessible/Accessible.h"
 
 MyApplication::MyApplication(int & argc, char** argv)
     : QApplication(argc, argv)