Merge pull request #534 from neobrain/disassembler-improvements

Disassembler improvements

src/citra_qt/debugger/disassembler.cpp

@@ -17,16 +17,9 @@
 #include "core/arm/skyeye_common/armdefs.h"
 #include "core/arm/disassembler/arm_disasm.h"
 
-DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractItemModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
 
-}
+DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
 
-QModelIndex DisassemblerModel::index(int row, int column, const QModelIndex& parent) const {
-    return createIndex(row, column);
-}
-
-QModelIndex DisassemblerModel::parent(const QModelIndex& child) const {
-    return QModelIndex();
 }
 
 int DisassemblerModel::columnCount(const QModelIndex& parent) const {

src/citra_qt/debugger/disassembler.h

@@ -2,8 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <QAbstractItemModel>
+#pragma once
+
+#include <QAbstractListModel>
 #include <QDockWidget>
+
 #include "ui_disassembler.h"
 
 #include "common/common.h"
@@ -12,15 +15,13 @@
 class QAction;
 class EmuThread;
 
-class DisassemblerModel : public QAbstractItemModel
+class DisassemblerModel : public QAbstractListModel
 {
     Q_OBJECT
 
 public:
     DisassemblerModel(QObject* parent);
 
-    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex& child) const override;
     int columnCount(const QModelIndex& parent = QModelIndex()) const override;
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

src/citra_qt/debugger/disassembler.ui

@@ -65,6 +65,9 @@
       <property name="rootIsDecorated">
        <bool>false</bool>
       </property>
+      <property name="uniformRowHeights">
+       <bool>true</bool>
+      </property>
       <attribute name="headerVisible">
        <bool>false</bool>
       </attribute>