From 4b562ea49d65d0c161c0f4720b869bbe41679f97 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 29 Nov 2017 18:18:19 +0000
Subject: [PATCH] Allow hitting enter on a file in the virtual file dialog to
 select

---
 qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp | 10 ++++++++++
 qrenderdoc/Windows/Dialogs/VirtualFileDialog.h   |  1 +
 qrenderdoc/Windows/Dialogs/VirtualFileDialog.ui  |  7 ++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
index 8cc851032..611ca4a28 100644
--- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
@@ -719,6 +719,16 @@ void VirtualFileDialog::on_fileList_clicked(const QModelIndex &index)
   ui->filename->setText(m_FileProxy->data(index, RemoteFileModel::FileNameRole).toString());
 }
 
+void VirtualFileDialog::on_fileList_keyPress(QKeyEvent *e)
+{
+  // only process when enter is pressed
+  if(e->key() != Qt::Key_Return && e->key() != Qt::Key_Enter)
+    return;
+
+  // pass on to the filename field as if we hit enter there
+  on_filename_keyPress(e);
+}
+
 void VirtualFileDialog::on_showHidden_toggled(bool checked)
 {
   m_DirProxy->showHidden = ui->showHidden->isChecked();
diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.h b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.h
index 428458724..211ad69ec 100644
--- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.h
+++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.h
@@ -51,6 +51,7 @@ private slots:
   void on_dirList_clicked(const QModelIndex &index);
   void on_fileList_doubleClicked(const QModelIndex &index);
   void on_fileList_clicked(const QModelIndex &index);
+  void on_fileList_keyPress(QKeyEvent *e);
   void on_showHidden_toggled(bool checked);
   void on_filename_keyPress(QKeyEvent *e);
   void on_filter_currentIndexChanged(int index);
diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.ui b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.ui
index dda1d0119..62faabf04 100644
--- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.ui
+++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.ui
@@ -121,7 +121,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QTreeView" name="fileList">
+      <widget class="RDTreeView" name="fileList">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>2</horstretch>
@@ -244,6 +244,11 @@
    <extends>QLineEdit</extends>
    <header>Widgets/Extended/RDLineEdit.h</header>
   </customwidget>
+  <customwidget>
+   <class>RDTreeView</class>
+   <extends>QTreeView</extends>
+   <header>Widgets/Extended/RDTreeView.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../Resources/resources.qrc"/>