+ fix problems with call tips window if text after dot is not a word

+ fix problems with history in python console

git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5356 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
wmayer 2011-12-29 11:20:49 +00:00
parent b755192047
commit 0b0f55e8f8
2 changed files with 20 additions and 1 deletions

View File

@ -156,6 +156,13 @@ void CallTipsList::validateCursor()
cursor.setPosition(this->cursorPos);
cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
QString word = cursor.selectedText();
if (!word.isEmpty()) {
// the following text might be an operator, brackets, ...
const QChar underscore = QLatin1Char('_');
const QChar ch = word.at(0);
if (!ch.isLetterOrNumber() && ch != underscore)
word.clear();
}
if (currentPos > this->cursorPos+word.length()) {
hide();
}

View File

@ -548,8 +548,20 @@ void PythonConsole::keyPressEvent(QKeyEvent * e)
restartHistory = false;
} break;
case Qt::Key_Backspace:
case Qt::Key_Left:
{
if (cursor > inputLineBegin)
{ TextEdit::keyPressEvent(e); }
restartHistory = false;
} break;
case Qt::Key_Right:
{
TextEdit::keyPressEvent(e);
restartHistory = false;
} break;
case Qt::Key_Backspace:
{
if (cursor > inputLineBegin)
{ TextEdit::keyPressEvent(e); }