AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCompleterItemDelegate: replace QItemDelegate with QStyledItemDelegate

Browse Source 
Resolve remaining Qt6 TODOs

Change-Id: Ice8dae2f1cbd3ed452ab78d5d7735127d7662900
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Wang Peng 2020-08-27 18:34:21 +08:00
parent bb3cdd6e3a
commit 2ee5449aca
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/util/qcompleter_p.h
View File

@ -58,7 +58,7 @@
#include "QtWidgets/qabstractitemview.h"
#include "QtCore/qabstractproxymodel.h"
#include "qcompleter.h"
#include "QtWidgets/qitemdelegate.h"
#include "qstyleditemdelegate.h"
#include "QtGui/qpainter.h"
#include "private/qabstractproxymodel_p.h"
@ -194,18 +194,17 @@ private:
const QIndexMapper& iv, QMatchData* m);
};
// ### Qt6: QStyledItemDelegate
class QCompleterItemDelegate : public QItemDelegate
class QCompleterItemDelegate : public QStyledItemDelegate
{
public:
QCompleterItemDelegate(QAbstractItemView *view)
: QItemDelegate(view), view(view) { }
: QStyledItemDelegate(view), view(view) { }
void paint(QPainter *p, const QStyleOptionViewItem& opt, const QModelIndex& idx) const override {
QStyleOptionViewItem optCopy = opt;
optCopy.showDecorationSelected = true;
if (view->currentIndex() == idx)
optCopy.state |= QStyle::State_HasFocus;
QItemDelegate::paint(p, optCopy, idx);
QStyledItemDelegate::paint(p, optCopy, idx);
}
private: