diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-09-08 08:42:22 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 12:29:23 +0200 |
| commit | 9d3866ed3293274b2c509c72bf101e94832688e7 (patch) | |
| tree | 7fc7a1e9bfcda740fca35ddee736dec19f9c65d3 /src/widgets/styles/qcommonstyle_p.h | |
| parent | c49c96fbb13912a749942f8f90a6d91656a11852 (diff) | |
[1/2] Optimize text drawing for QStyleOptionViewItem in QCommonStyle
Optimize isViewItemCached() a bit by reordering conditions so that
conditions that going to change more often in a common case evaluated first.
Change-Id: Ibb406f964345e8f2bff7b433bf33e09a99dcbdc4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/widgets/styles/qcommonstyle_p.h')
| -rw-r--r-- | src/widgets/styles/qcommonstyle_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/styles/qcommonstyle_p.h b/src/widgets/styles/qcommonstyle_p.h index 979c2a5548..8f8a97a2dc 100644 --- a/src/widgets/styles/qcommonstyle_p.h +++ b/src/widgets/styles/qcommonstyle_p.h @@ -92,19 +92,19 @@ public: mutable QRect decorationRect, displayRect, checkRect; mutable QStyleOptionViewItem *cachedOption; bool isViewItemCached(const QStyleOptionViewItem &option) const { - return cachedOption && (option.rect == cachedOption->rect - && option.direction == cachedOption->direction + return cachedOption && (option.widget == cachedOption->widget + && option.index == cachedOption->index && option.state == cachedOption->state + && option.rect == cachedOption->rect + && option.text == cachedOption->text + && option.direction == cachedOption->direction && option.displayAlignment == cachedOption->displayAlignment && option.decorationAlignment == cachedOption->decorationAlignment && option.decorationPosition == cachedOption->decorationPosition && option.decorationSize == cachedOption->decorationSize - && option.font == cachedOption->font && option.features == cachedOption->features - && option.widget == cachedOption->widget - && option.index == cachedOption->index && option.icon.isNull() == cachedOption->icon.isNull() - && option.text == cachedOption->text + && option.font == cachedOption->font && option.viewItemPosition == cachedOption->viewItemPosition); } #endif |