diff options
| author |  Fabio Bas | 2009-12-17 14:09:16 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-12-17 14:09:16 +0000 |
| commit | 29a1ae7b173efcce7c7a92f3bbdad84de721b062 (patch) | |
| tree | 82cef271a2215745ba2595524bcc0d049347751e | |
| parent | correctly check for scrnsaverproto.h before trying to include it (diff) | |
| download | KVIrc-29a1ae7b173efcce7c7a92f3bbdad84de721b062.tar.gz KVIrc-29a1ae7b173efcce7c7a92f3bbdad84de721b062.tar.bz2 KVIrc-29a1ae7b173efcce7c7a92f3bbdad84de721b062.zip | |
reverted part of r3694 that broke ctrl+enter in inputbar
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3700 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/ui/kvi_input_editor.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/kvi_input_editor.cpp index 2f4110abd..7de90b38b 100644 --- a/src/kvirc/ui/kvi_input_editor.cpp +++ b/src/kvirc/ui/kvi_input_editor.cpp @@ -1470,7 +1470,26 @@ void KviInputEditor::keyPressEvent(QKeyEvent * e) break; case Qt::Key_Return: case Qt::Key_Enter: - returnPressed(); + if(m_pInputParent->inherits("KviInput")) + { + QString szBuffer(m_szTextBuffer); + m_szTextBuffer=""; + selectOneChar(-1); + m_iCursorPosition = 0; + m_iFirstVisibleChar = 0; + repaintWithCursorOn(); + KviUserInput::parseNonCommand(szBuffer,m_pKviWindow); + if (!szBuffer.isEmpty()) + { + KviInputHistory::instance()->add(new QString(szBuffer)); + m_pHistory->insert(0,new QString(szBuffer)); + } + + __range_valid(KVI_INPUT_MAX_LOCAL_HISTORY_ENTRIES > 1); //ABSOLUTELY NEEDED, if not, pHist will be destroyed... + if(m_pHistory->count() > KVI_INPUT_MAX_LOCAL_HISTORY_ENTRIES)m_pHistory->removeLast(); + + m_iCurHistoryIdx = -1; + } break; default: if(!m_bReadOnly) insertText(e->text()); |