From a3b1547175eb776498f15ff662ecf309a7af8009 Mon Sep 17 00:00:00 2001
From: Brian Potchik <brian@vector35.com>
Date: Sat, 25 May 2019 14:44:12 -0400
Subject: Fix remaining button state tracking bugs.

---
 examples/triage/byte.cpp | 13 +------------
 examples/triage/byte.h   |  2 --
 ui/hexeditor.h           |  2 --
 ui/typeview.h            |  2 --
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/examples/triage/byte.cpp b/examples/triage/byte.cpp
index b1ff46fd..cac2c587 100644
--- a/examples/triage/byte.cpp
+++ b/examples/triage/byte.cpp
@@ -44,7 +44,6 @@ ByteView::ByteView(QWidget* parent, BinaryViewRef data): QAbstractScrollArea(par
 	m_selectionVisible = false;
 	m_caretVisible = false;
 	m_caretBlink = true;
-	m_leftButtonDown = false;
 	m_cols = 128;
 	m_updatesRequired = false;
 	m_visibleRows = 1;
@@ -783,7 +782,6 @@ void ByteView::focusInEvent(QFocusEvent*)
 void ByteView::focusOutEvent(QFocusEvent*)
 {
 	m_caretVisible = false;
-	m_leftButtonDown = false;
 	updateCaret();
 }
 
@@ -1069,13 +1067,12 @@ void ByteView::mousePressEvent(QMouseEvent* event)
 	repositionCaret();
 	if ((event->modifiers() & Qt::ShiftModifier) != 0)
 		viewport()->update();
-	m_leftButtonDown = true;
 }
 
 
 void ByteView::mouseMoveEvent(QMouseEvent* event)
 {
-	if (!m_leftButtonDown)
+	if (event->buttons() != Qt::LeftButton)
 		return;
 	int x = (event->x() - 2) / m_render.getFontWidth() - ((int)m_addrWidth + 2);
 	int y = (event->y() - 2) / m_render.getFontHeight();
@@ -1089,14 +1086,6 @@ void ByteView::mouseMoveEvent(QMouseEvent* event)
 }
 
 
-void ByteView::mouseReleaseEvent(QMouseEvent* event)
-{
-	if (event->button() != Qt::LeftButton)
-		return;
-	m_leftButtonDown = false;
-}
-
-
 ByteViewType::ByteViewType(): ViewType("Bytes", "Byte Overview")
 {
 }
diff --git a/examples/triage/byte.h b/examples/triage/byte.h
index acf64eb6..226ccd5e 100644
--- a/examples/triage/byte.h
+++ b/examples/triage/byte.h
@@ -32,7 +32,6 @@ class ByteView: public QAbstractScrollArea, public View
 	std::vector<BNAddressRange> m_ranges;
 	uint64_t m_allocatedLength, m_scrollBarMultiplier;
 
-	bool m_leftButtonDown;
 	int m_lastMouseX, m_lastMouseY;
 	int m_wheelDelta;
 	bool m_updatingScrollBar;
@@ -101,7 +100,6 @@ protected:
 	virtual void focusOutEvent(QFocusEvent* event) override;
 	virtual void mousePressEvent(QMouseEvent* event) override;
 	virtual void mouseMoveEvent(QMouseEvent* event) override;
-	virtual void mouseReleaseEvent(QMouseEvent* event) override;
 
 private Q_SLOTS:
 	void scrollBarMoved(int value);
diff --git a/ui/hexeditor.h b/ui/hexeditor.h
index b628a2dd..1c5ff71b 100644
--- a/ui/hexeditor.h
+++ b/ui/hexeditor.h
@@ -161,7 +161,6 @@ private:
 	bool m_cursorAscii;
 	bool m_caretVisible, m_caretBlink;
 	bool m_insertMode;
-	bool m_leftButtonDown;
 	QString m_status;
 	QTimer* m_cursorTimer;
 	QTimer* m_updateTimer;
@@ -181,7 +180,6 @@ protected:
 	virtual void keyReleaseEvent(QKeyEvent* event) override;
 	virtual void mousePressEvent(QMouseEvent* event) override;
 	virtual void mouseMoveEvent(QMouseEvent* event) override;
-	virtual void mouseReleaseEvent(QMouseEvent* event) override;
 	virtual bool event(QEvent* event) override;
 	virtual void wheelEvent(QWheelEvent* event) override;
 
diff --git a/ui/typeview.h b/ui/typeview.h
index 558954ee..538b2e85 100644
--- a/ui/typeview.h
+++ b/ui/typeview.h
@@ -100,7 +100,6 @@ class BINARYNINJAUIAPI TypeView: public QAbstractScrollArea, public View, public
 	size_t m_selectionStartTypeIndex;
 	size_t m_selectionStartLine;
 	size_t m_selectionStartOffset;
-	bool m_leftButtonDown;
 
 	std::map<BinaryNinja::QualifiedName, std::vector<TypeDefinitionLine>> m_typeLines;
 	std::vector<TypeLineIndex> m_types;
@@ -201,7 +200,6 @@ protected:
 	virtual void paintEvent(QPaintEvent* event) override;
 	virtual void mousePressEvent(QMouseEvent* event) override;
 	virtual void mouseMoveEvent(QMouseEvent* event) override;
-	virtual void mouseReleaseEvent(QMouseEvent* event) override;
 	virtual void mouseDoubleClickEvent(QMouseEvent* event) override;
 	virtual void scrollContentsBy(int dx, int dy) override;
 
-- 
cgit v1.3.1