From f2baf31d5159acd66eb13a3a7dd0cc0ea4d2c116 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <lukec@alleninstitute.org>
Date: Wed, 20 Jun 2018 13:01:52 -0700
Subject: [PATCH] Fix console input up/down arrows

In some cases, pressing down past the end of the command history would not clear the input
---
 pyqtgraph/console/CmdInput.py | 42 +++++++++--------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/pyqtgraph/console/CmdInput.py b/pyqtgraph/console/CmdInput.py
index 24a01e89..21d25382 100644
--- a/pyqtgraph/console/CmdInput.py
+++ b/pyqtgraph/console/CmdInput.py
@@ -9,19 +9,18 @@ class CmdInput(QtGui.QLineEdit):
         QtGui.QLineEdit.__init__(self, parent)
         self.history = [""]
         self.ptr = 0
-        #self.lastCmd = None
-        #self.setMultiline(False)
     
     def keyPressEvent(self, ev):
-        #print "press:", ev.key(), QtCore.Qt.Key_Up, QtCore.Qt.Key_Down, QtCore.Qt.Key_Enter
-        if ev.key() == QtCore.Qt.Key_Up and self.ptr < len(self.history) - 1:
-            self.setHistory(self.ptr+1)
-            ev.accept()
-            return
-        elif ev.key() ==  QtCore.Qt.Key_Down and self.ptr > 0:
-            self.setHistory(self.ptr-1)
-            ev.accept()
-            return
+        if ev.key() == QtCore.Qt.Key_Up:
+            if self.ptr < len(self.history) - 1:
+                self.setHistory(self.ptr+1)
+                ev.accept()
+                return
+        elif ev.key() ==  QtCore.Qt.Key_Down:
+            if self.ptr > 0:
+                self.setHistory(self.ptr-1)
+                ev.accept()
+                return
         elif ev.key() == QtCore.Qt.Key_Return:
             self.execCmd()
         else:
@@ -32,7 +31,6 @@ class CmdInput(QtGui.QLineEdit):
         cmd = asUnicode(self.text())
         if len(self.history) == 1 or cmd != self.history[1]:
             self.history.insert(1, cmd)
-        #self.lastCmd = cmd
         self.history[0] = ""
         self.setHistory(0)
         self.sigExecuteCmd.emit(cmd)
@@ -40,23 +38,3 @@ class CmdInput(QtGui.QLineEdit):
     def setHistory(self, num):
         self.ptr = num
         self.setText(self.history[self.ptr])
-        
-    #def setMultiline(self, m):
-        #height = QtGui.QFontMetrics(self.font()).lineSpacing()
-        #if m:
-            #self.setFixedHeight(height*5)
-        #else:
-            #self.setFixedHeight(height+15)
-            #self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-            #self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-            
-       
-    #def sizeHint(self):
-        #hint = QtGui.QPlainTextEdit.sizeHint(self)
-        #height = QtGui.QFontMetrics(self.font()).lineSpacing()
-        #hint.setHeight(height)
-        #return hint
-
-        
-        
-        
\ No newline at end of file