Hook up the jump/find bars

qrenderdoc/Widgets/CustomPaintWidget.h

@@ -1,5 +1,4 @@
-#ifndef CUSTOMPAINTWIDGET_H
-#define CUSTOMPAINTWIDGET_H
+#pragma once
 
 #include <QWidget>
 
@@ -24,5 +23,3 @@ class CustomPaintWidget : public QWidget
 
     IReplayOutput *m_Output;
 };
-
-#endif // CUSTOMPAINTWIDGET_H

qrenderdoc/Widgets/LineEditFocusWidget.cpp

@@ -0,0 +1,22 @@
+#include "LineEditFocusWidget.h"
+
+LineEditFocusWidget::LineEditFocusWidget(QWidget *parent) : QLineEdit(parent)
+{
+}
+
+LineEditFocusWidget::~LineEditFocusWidget()
+{
+
+}
+
+void LineEditFocusWidget::focusInEvent(QFocusEvent *e)
+{
+    QLineEdit::focusInEvent(e);
+    emit(enter());
+}
+
+void LineEditFocusWidget::focusOutEvent(QFocusEvent *e)
+{
+    QLineEdit::focusOutEvent(e);
+    emit(leave());
+}

qrenderdoc/Widgets/LineEditFocusWidget.h

@@ -0,0 +1,20 @@
+#pragma once
+#include <QLineEdit>
+
+class LineEditFocusWidget : public QLineEdit
+{
+    Q_OBJECT
+  public:
+    explicit LineEditFocusWidget(QWidget *parent = 0);
+    ~LineEditFocusWidget();
+
+  signals:
+    void enter();
+    void leave();
+
+  public slots:
+
+  protected:
+    void focusInEvent(QFocusEvent *e);
+    void focusOutEvent(QFocusEvent *e);
+};

qrenderdoc/Windows/EventBrowser.cpp

@@ -47,6 +47,10 @@ EventBrowser::EventBrowser(Core *core, QWidget *parent) :
   // becomes quickly infuriating to rearrange, just disable until that can be fixed.
   ui->events->header()->setSectionsMovable(false);
 
+  QObject::connect(ui->closeFind, &QToolButton::clicked, this, &EventBrowser::hideFindJump);
+  QObject::connect(ui->closeJump, &QToolButton::clicked, this, &EventBrowser::hideFindJump);
+  QObject::connect(ui->jumpToEID, &LineEditFocusWidget::leave, this, &EventBrowser::hideFindJump);
+  QObject::connect(ui->findEvent, &LineEditFocusWidget::leave, this, &EventBrowser::hideFindJump);
   ui->jumpStrip->hide();
   ui->findStrip->hide();
   ui->bookmarkStrip->hide();
@@ -88,6 +92,7 @@ void EventBrowser::on_find_clicked()
   ui->jumpStrip->hide();
   ui->findStrip->show();
   ui->bookmarkStrip->hide();
+  ui->findEvent->setFocus();
 }
 
 void EventBrowser::on_gotoEID_clicked()
@@ -95,6 +100,7 @@ void EventBrowser::on_gotoEID_clicked()
   ui->jumpStrip->show();
   ui->findStrip->hide();
   ui->bookmarkStrip->hide();
+  ui->jumpToEID->setFocus();
 }
 
 void EventBrowser::on_toolButton_clicked()
@@ -168,3 +174,24 @@ void EventBrowser::on_events_itemSelectionChanged()
 
     m_Core->SetEventID(this, 0, EID);
 }
+
+void EventBrowser::hideFindJump()
+{
+  ui->jumpStrip->hide();
+  ui->findStrip->hide();
+}
+
+void EventBrowser::on_jumpToEID_returnPressed()
+{
+  bool ok = false;
+  uint eid = ui->findEvent->text().toUInt(&ok);
+  if(ok)
+  {
+    //SelectEvent(0, eid);
+  }
+}
+
+void EventBrowser::on_findEvent_returnPressed()
+{
+
+}

qrenderdoc/Windows/EventBrowser.h

@@ -32,6 +32,12 @@ class EventBrowser : public QFrame, public ILogViewerForm
 
     void on_toolButton_clicked();
 
+    void hideFindJump();
+
+    void on_jumpToEID_returnPressed();
+
+    void on_findEvent_returnPressed();
+
     private:
     Ui::EventBrowser *ui;
     Core *m_Core;

qrenderdoc/Windows/EventBrowser.ui

@@ -236,7 +236,7 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="QLineEdit" name="jumpToEID">
+          <widget class="LineEditFocusWidget" name="jumpToEID">
            <property name="minimumSize">
             <size>
              <width>0</width>
@@ -260,6 +260,23 @@
         </layout>
        </widget>
       </item>
+      <item>
+       <widget class="QToolButton" name="closeJump">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../resources.qrc">
+          <normaloff>:/Resources/cross.png</normaloff>:/Resources/cross.png</iconset>
+        </property>
+        <property name="shortcut">
+         <string>Esc</string>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -332,7 +349,7 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="QLineEdit" name="findEvent">
+          <widget class="LineEditFocusWidget" name="findEvent">
            <property name="minimumSize">
             <size>
              <width>0</width>
@@ -540,6 +557,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LineEditFocusWidget</class>
+   <extends>QLineEdit</extends>
+   <header>Widgets/LineEditFocusWidget.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../resources.qrc"/>
  </resources>

qrenderdoc/qrenderdoc.pro

@@ -63,7 +63,8 @@ SOURCES += Code/main.cpp \
     3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp \
     3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp \
     Code/RenderManager.cpp \
-    Code/Core.cpp
+    Code/Core.cpp \
+    Widgets/LineEditFocusWidget.cpp
 
 HEADERS  += Windows/MainWindow.h \
     Windows/EventBrowser.h \
@@ -73,7 +74,8 @@ HEADERS  += Windows/MainWindow.h \
     3rdparty/toolwindowmanager/ToolWindowManagerArea.h \
     3rdparty/toolwindowmanager/ToolWindowManagerWrapper.h \
     Code/Core.h \
-    Code/RenderManager.h
+    Code/RenderManager.h \
+    Widgets/LineEditFocusWidget.h
 
 FORMS    += Windows/MainWindow.ui \
     Windows/EventBrowser.ui \