Merge pull request 'master' (#68) from master into release

Reviewed-on: https://git.shs.tools/SHS/libs/pulls/68

qad/libs/widgets/qcodeedit.cpp

@@ -1243,7 +1243,7 @@ void QCodeEdit::invokeAutoCompletition(bool force) {
 		hideHelp();
 		return;
 	}
-	if (word_complet) acl << wordsCompletitionList(scope.second);
+	acl << wordsCompletitionList(scope.second);
 	QFont bf(font());
 	bf.setBold(true);
 	foreach (const ACPair & ac, acl) {
@@ -1274,9 +1274,8 @@ void QCodeEdit::invokeAutoCompletition(bool force) {
 		completer->setVisible(true);
 		//qApp->processEvents();
 		int sz = completer->verticalScrollBar()->width();
-		sz += ((QAbstractItemView*)completer)->viewport()->width();
+		for (int i = 0; i < completer->header()->count(); ++i)
-//		for (int i = 0; i < completer->header()->count(); ++i)
+			sz += qMax<int>(sz, ((QAbstractItemView*)completer)->sizeHintForColumn(i));
-//			sz += ((QAbstractItemView*)completer)->sizeHintForColumn(i);
 		completer->resize(sz, fontHeight() * 16);
 	} else
 		completer->hide();

qad/libs/widgets/qcodeedit.h

@@ -38,7 +38,6 @@ class QAD_WIDGETS_EXPORT QCodeEdit: public QWidget
 	Q_PROPERTY(QString text READ text WRITE setText)
 	Q_PROPERTY(bool showSpaces READ showSpaces WRITE setShowSpaces)
 	Q_PROPERTY(bool showLineNumbers READ showLineNumbers WRITE setShowLineNumbers)
-	Q_PROPERTY(bool wordCompletitionEnabled READ wordCompletitionEnabled WRITE setWordCompletitionEnabled)
 	Q_PROPERTY(QFont editorFont READ editorFont WRITE setEditorFont)
 	
 public:
@@ -73,8 +72,6 @@ public:
 	
 	void registerAutoCompletitionClass(int id, ACClassType ac_class, const QString & name, const QIcon & icon = QIcon()) {ac_classes[id] = ACClass(id, ac_class, name, icon);}
 	
-	bool wordCompletitionEnabled() const {return word_complet;}
-
 protected:
 	typedef QPair<QString, QString> StringsPair;
 	typedef QPair<int, QList<StringsPair> > ACPair;
@@ -114,7 +111,6 @@ private:
 	QStringList cursor_scope;
 	int prev_lc, auto_comp_pl, timer, cur_search_ind, pos_press, pos_el_press;
 	bool spaces_, _ignore_focus_out, _first, _destructor, _replacing;
-	bool word_complet;
 	
 	bool eventFilter(QObject * o, QEvent * e);
 	void showEvent(QShowEvent * );
@@ -128,7 +124,7 @@ private:
 	void clearSearch();
 	void moveToSearch();
 	int searchIndFromCursor();
-
+	
 private slots:
 	void syncScrolls();
 	void scrollUp();
@@ -167,9 +163,7 @@ public slots:
 	void searchNext(bool next = true);
 	void searchPrevious();
 	void hideSearch();
-	void setWordCompletitionEnabled(bool on) {word_complet = on;}
 	
-
 signals:
 	void textChanged();
 	void parseRequest();