From 531a670dca8bc60bbdf5ff3a6f3cbce388597b60 Mon Sep 17 00:00:00 2001
From: mlong <markdlong128@gmail.com>
Date: Sat, 23 Jan 2021 15:38:53 -0600
Subject: [PATCH] Fixed labels on non-data members of assembly.

---
 src/ui/viewers/disassemblerviewer.cpp | 9 +++++++++
 src/ui/widgets/FlowLineTextBrowser.h  | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/src/ui/viewers/disassemblerviewer.cpp b/src/ui/viewers/disassemblerviewer.cpp
index d0bdacf..4c04763 100644
--- a/src/ui/viewers/disassemblerviewer.cpp
+++ b/src/ui/viewers/disassemblerviewer.cpp
@@ -77,6 +77,7 @@ void DisassemblerViewer::setFile(BinaryFile *file) {
     m_file = file;
     m_isRelo = false;
 
+    setCursor(Qt::WaitCursor);
     m_bfm = new BinaryFileMetadata(m_file, file->address(), this);
 
     connect(m_bfm, &BinaryFileMetadata::doDisassemble,
@@ -92,12 +93,15 @@ void DisassemblerViewer::setFile(BinaryFile *file) {
     QList<quint16> addresses = m_bfm->entryPoints()->getEntryPointAddresses();
     if (!addresses.count()) { addresses.append(address); }
     handleDisassembleRequest(addresses);
+    unsetCursor();
 }
 
 void DisassemblerViewer::setFile(RelocatableFile *file) {
     m_file = file;
     m_isRelo = true;
 
+    setCursor(Qt::WaitCursor);
+
     m_bfm = new BinaryFileMetadata(m_file, file->address() + 6, this);
 
     connect(m_bfm, &BinaryFileMetadata::doDisassemble,
@@ -113,6 +117,7 @@ void DisassemblerViewer::setFile(RelocatableFile *file) {
     QList<quint16> addresses = m_bfm->entryPoints()->getEntryPointAddresses();
     if (!addresses.count()) { addresses.append(address); }
     handleDisassembleRequest(addresses);
+    unsetCursor();
 }
 
 void DisassemblerViewer::handleDisassembleRequest(QList<quint16> addresses)
@@ -227,6 +232,10 @@ void DisassemblerViewer::disassemble(QList<quint16> entryPoints) {
                     usedefault = true;
                 }
             }
+            else
+            {
+                usedefault = true;
+            }
 
             if (usedefault)
             {
diff --git a/src/ui/widgets/FlowLineTextBrowser.h b/src/ui/widgets/FlowLineTextBrowser.h
index ee96e12..995e0bd 100644
--- a/src/ui/widgets/FlowLineTextBrowser.h
+++ b/src/ui/widgets/FlowLineTextBrowser.h
@@ -25,6 +25,7 @@ public:
 
     void setJumpLines(JumpLines *jl);
 
+    void proxyWheelEvent(QWheelEvent *ev) { if (ev)  { wheelEvent(ev); } }
 protected:
     void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
     void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
@@ -35,6 +36,9 @@ protected:
     QRect getBlockGeometry(QTextBlock block) const;
     bool isBlockVisible(QTextBlock block) const;
     void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
+
+   // void wheelEvent(QWheelEvent *ev)  Q_DECL_OVERRIDE { if (ev) { ev->ignore(); } }
+
 private slots:
     void updateLineAreaWidth();
     void updateLineArea(const QRect &, int);
@@ -68,6 +72,9 @@ protected:
         m_browser->lineAreaPaintEvent(event);
     }
 
+    void wheelEvent(QWheelEvent *ev)  Q_DECL_OVERRIDE { m_browser->proxyWheelEvent(ev); }
+
+
 private:
     FlowLineTextBrowser *m_browser;
     JumpLines *m_jl;