SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

completer fixes

Browse Source
This commit is contained in:
Бычков Андрей
2020-09-14 15:22:15 +03:00
parent 596ec969c6
commit 2e553719dd
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/widgets/qcodeedit.cpp
View File

@@ -416,7 +416,7 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
completer->hide(); completer->hide();
hideHelp(); hideHelp();
} }
if (e->type() == QEvent::MouseMove) { if (e->type() == QEvent::MouseMove && completer->isHidden()) {
QMouseEvent * me = (QMouseEvent*)e; QMouseEvent * me = (QMouseEvent*)e;
if (me->modifiers().testFlag(Qt::ControlModifier)) { if (me->modifiers().testFlag(Qt::ControlModifier)) {
showLink(); showLink();

17
libs/widgets/qcodeedit_completer_p.cpp
View File

@@ -70,21 +70,16 @@ void QCodeEditCompleter::addItems(QFont f, const QCodeEdit::ACClass & cl, const
} }
bool QCodeEditCompleter::isEmpty() const {
return topLevelItemCount() <= 1;
}
void QCodeEditCompleter::invoke(QPoint global_pos) { void QCodeEditCompleter::invoke(QPoint global_pos) {
if (isEmpty()) { if (topLevelItemCount() > 1) setCurrentItem(topLevelItem(1));
if (isHidden()) move(global_pos);
if (topLevelItemCount() > 0) {
setVisible(true);
adjust();
} else {
hide(); hide();
return;
} }
setCurrentItem(topLevelItem(1));
if (isHidden())
move(global_pos);
setVisible(true);
adjust();
} }

1
libs/widgets/qcodeedit_completer_p.h
View File

@@ -34,7 +34,6 @@ public:
void nextCompletition(); void nextCompletition();
void previousCompletition(); void previousCompletition();
void addItems(QFont f, const QCodeEdit::ACClass & cl, const QCodeEdit::ACSection & items); void addItems(QFont f, const QCodeEdit::ACClass & cl, const QCodeEdit::ACSection & items);
bool isEmpty() const;
void invoke(QPoint global_pos); void invoke(QPoint global_pos);
QString currentReturn() const; QString currentReturn() const;