diff options
author | Gerald Combs <gerald@wireshark.org> | 2016-12-01 14:32:29 -0800 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-12-02 03:34:17 +0000 |
commit | 8d927a98fdac92b562cfd5c769f7ae7bed0ace2d (patch) | |
tree | 02874f28940be02ecf8fe291c558651175cae43d /ui/qt/percent_bar_delegate.h | |
parent | 672a5bd5468322cc3264886cf1655519f2dbf503 (diff) |
Qt: Fix QStyledItemDelegate assertions.
QStyledItemDelegate::paint asserts if you pass it an empty QModelIndex.
We were doing this in PercentBarDelegate and TimelineDelegate in order to
keep it from drawing any text. Return an empty string from ::displayText
instead, which appears to be the correct way to paint without text.
Bug: 13180
Change-Id: I8064d9575e04e95a926797eec7f6ad2b0bfef1c0
Reviewed-on: https://code.wireshark.org/review/19007
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/percent_bar_delegate.h')
-rw-r--r-- | ui/qt/percent_bar_delegate.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/qt/percent_bar_delegate.h b/ui/qt/percent_bar_delegate.h index 0a3ac9af67..2c8d47288f 100644 --- a/ui/qt/percent_bar_delegate.h +++ b/ui/qt/percent_bar_delegate.h @@ -51,6 +51,10 @@ class PercentBarDelegate : public QStyledItemDelegate public: PercentBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) { } + + // Make sure QStyledItemDelegate::paint doesn't draw any text. + virtual QString displayText(const QVariant &, const QLocale &) const { return QString(); } + protected: void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; |