From 9d3866ed3293274b2c509c72bf101e94832688e7 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Sun, 8 Sep 2013 08:42:22 +0300 Subject: [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 Reviewed-by: Jens Bache-Wiig --- src/widgets/styles/qcommonstyle_p.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/widgets') 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 -- cgit v1.2.3