From 60a34395506a3768510cbe155a8b85440ce4b356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Mon, 19 Mar 2018 09:20:34 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@366 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/widgets/qcodeedit.cpp | 5 +++-- qad/widgets/qcodeedit.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qad/widgets/qcodeedit.cpp b/qad/widgets/qcodeedit.cpp index d874476..a491a1c 100644 --- a/qad/widgets/qcodeedit.cpp +++ b/qad/widgets/qcodeedit.cpp @@ -101,6 +101,7 @@ QCodeEdit::QCodeEdit(QWidget * parent): QWidget(parent) { connect(completer, SIGNAL(itemDoubleClicked(QTreeWidgetItem * ,int)), this, SLOT(commitCompletition())); connect(ui->textCode->verticalScrollBar(), SIGNAL(valueChanged(int)), ui->textLines->verticalScrollBar(), SLOT(setValue(int))); + connect(ui->textCode->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(hideHelp())); connect(ui->textCode, SIGNAL(textChanged()), this, SLOT(textEdit_textChanged())); connect(ui->textCode, SIGNAL(textChanged()), this, SIGNAL(textChanged())); connect(ui->textCode, SIGNAL(cursorPositionChanged()), this, SLOT(textEdit_cursorPositionChanged())); @@ -643,7 +644,7 @@ void QCodeEdit::search_triggered() { void QCodeEdit::syncScrolls() { ui->textLines->verticalScrollBar()->setValue(ui->textCode->verticalScrollBar()->value()); ui->textLines->setHorizontalScrollBarPolicy(ui->textCode->horizontalScrollBar()->isVisible() ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff); - hideHelp(); + //qDebug() << "!!!"; } @@ -943,7 +944,6 @@ QString QCodeEdit::selectArg(QString s, int arg) { void QCodeEdit::raiseHelp(QTextCursor tc, int arg) { bool ok; QPair scope = getScope(tc, &ok); - //qDebug() << "help" << scope; QString st = tc.selectedText(); if (arg >= 0) st = scope.second; if (!ok || st.isEmpty()) { @@ -980,6 +980,7 @@ void QCodeEdit::raiseHelp(QTextCursor tc, int arg) { hideHelp(); return; } + //qDebug() << "help found" << tc.selectionStart() << tc.selectionEnd(); es_cursor.cursor = tc; applyExtraSelection(); //tc.movePosition(QTextCursor::StartOfWord, QTextCursor::MoveAnchor); diff --git a/qad/widgets/qcodeedit.h b/qad/widgets/qcodeedit.h index 86096ab..04ff15d 100644 --- a/qad/widgets/qcodeedit.h +++ b/qad/widgets/qcodeedit.h @@ -65,7 +65,6 @@ protected: virtual void parse() {} QString selectArg(QString s, int arg); void raiseHelp(QTextCursor tc, int arg = -1); - void hideHelp(); QTextCursor functionStart(QTextCursor tc, int * arg); ACList wordsCompletitionList(const QString & written) const; QPair getScope(QTextCursor tc, bool * ok = 0); @@ -109,6 +108,7 @@ private: private slots: void syncScrolls(); + void hideHelp(); void deleteLine(); void copyLineUp(); void copyLineDown();