From 8931ed4086d055942cc8e24efc4d69b1bddb8fe6 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 29 Nov 2017 18:17:36 +0000
Subject: [PATCH] Move leave and keyPress events from RDTreeWidget to
 RDTreeView

---
 qrenderdoc/Widgets/Extended/RDTreeView.cpp   | 10 ++++++++++
 qrenderdoc/Widgets/Extended/RDTreeView.h     |  5 +++++
 qrenderdoc/Widgets/Extended/RDTreeWidget.cpp |  4 ----
 qrenderdoc/Widgets/Extended/RDTreeWidget.h   |  2 --
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/qrenderdoc/Widgets/Extended/RDTreeView.cpp b/qrenderdoc/Widgets/Extended/RDTreeView.cpp
index 93ba0cb82..0e8db3aad 100644
--- a/qrenderdoc/Widgets/Extended/RDTreeView.cpp
+++ b/qrenderdoc/Widgets/Extended/RDTreeView.cpp
@@ -142,9 +142,19 @@ void RDTreeView::leaveEvent(QEvent *e)
     m_ElidedTooltip->hide();
 
   m_currentHoverIndex = QModelIndex();
+
+  emit leave(e);
+
   QTreeView::leaveEvent(e);
 }
 
+void RDTreeView::keyPressEvent(QKeyEvent *e)
+{
+  emit(keyPress(e));
+
+  QTreeView::keyPressEvent(e);
+}
+
 bool RDTreeView::viewportEvent(QEvent *event)
 {
   if(m_TooltipElidedItems && event->type() == QEvent::ToolTip)
diff --git a/qrenderdoc/Widgets/Extended/RDTreeView.h b/qrenderdoc/Widgets/Extended/RDTreeView.h
index 72bf535e2..407d52f6a 100644
--- a/qrenderdoc/Widgets/Extended/RDTreeView.h
+++ b/qrenderdoc/Widgets/Extended/RDTreeView.h
@@ -88,11 +88,16 @@ public:
   void setItemDelegate(QAbstractItemDelegate *delegate);
   QAbstractItemDelegate *itemDelegate() const;
 
+signals:
+  void leave(QEvent *e);
+  void keyPress(QKeyEvent *e);
+
 protected:
   void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override;
   void mouseMoveEvent(QMouseEvent *e) override;
   void wheelEvent(QWheelEvent *e) override;
   void leaveEvent(QEvent *e) override;
+  void keyPressEvent(QKeyEvent *e) override;
   bool viewportEvent(QEvent *event) override;
 
   void drawRow(QPainter *painter, const QStyleOptionViewItem &options,
diff --git a/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp b/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp
index 61f7aa365..87d4a620c 100644
--- a/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp
+++ b/qrenderdoc/Widgets/Extended/RDTreeWidget.cpp
@@ -921,8 +921,6 @@ void RDTreeWidget::leaveEvent(QEvent *e)
     m_model->itemChanged(item, {Qt::DecorationRole, Qt::BackgroundRole, Qt::ForegroundRole});
   }
 
-  emit leave(e);
-
   RDTreeView::leaveEvent(e);
 }
 
@@ -994,8 +992,6 @@ void RDTreeWidget::keyPressEvent(QKeyEvent *e)
   {
     RDTreeView::keyPressEvent(e);
   }
-
-  emit(keyPress(e));
 }
 
 void RDTreeWidget::drawBranches(QPainter *painter, const QRect &rect, const QModelIndex &index) const
diff --git a/qrenderdoc/Widgets/Extended/RDTreeWidget.h b/qrenderdoc/Widgets/Extended/RDTreeWidget.h
index e7f7b00d2..4eb23d103 100644
--- a/qrenderdoc/Widgets/Extended/RDTreeWidget.h
+++ b/qrenderdoc/Widgets/Extended/RDTreeWidget.h
@@ -272,8 +272,6 @@ public:
 
 signals:
   void mouseMove(QMouseEvent *e);
-  void leave(QEvent *e);
-  void keyPress(QKeyEvent *e);
   void itemClicked(RDTreeWidgetItem *item, int column);
   void itemChanged(RDTreeWidgetItem *item, int column);
   void itemDoubleClicked(RDTreeWidgetItem *item, int column);