From e560a2f6462044c4cf3c66366b6995cf74dd8e2d Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sun, 13 Nov 2011 20:55:51 +0100 Subject: Fix selection style issues Don't use a custom drawing code for showing the hover-indication or selection of the text. - The default style for items is used. - Merge icon-rectangle and text-rectangle if possible. - Fix background and minor focus-issues --- src/kitemviews/kitemlistselectiontoggle.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/kitemviews/kitemlistselectiontoggle.cpp') diff --git a/src/kitemviews/kitemlistselectiontoggle.cpp b/src/kitemviews/kitemlistselectiontoggle.cpp index 43725e0de..014f65b40 100644 --- a/src/kitemviews/kitemlistselectiontoggle.cpp +++ b/src/kitemviews/kitemlistselectiontoggle.cpp @@ -23,6 +23,8 @@ #include #include +#include + KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) : QGraphicsWidget(parent, 0), m_checked(false), @@ -80,7 +82,20 @@ void KItemListSelectionToggle::hoverLeaveEvent(QGraphicsSceneHoverEvent* event) void KItemListSelectionToggle::updatePixmap() { const char* icon = m_checked ? "list-remove" : "list-add"; - const int iconSize = qMin(size().width(), size().height()); + + int iconSize = qMin(size().width(), size().height()); + if (iconSize < KIconLoader::SizeSmallMedium) { + iconSize = KIconLoader::SizeSmall; + } else if (iconSize < KIconLoader::SizeMedium) { + iconSize = KIconLoader::SizeSmallMedium; + } else if (iconSize < KIconLoader::SizeLarge) { + iconSize = KIconLoader::SizeMedium; + } else if (iconSize < KIconLoader::SizeHuge) { + iconSize = KIconLoader::SizeLarge; + } else if (iconSize < KIconLoader::SizeEnormous) { + iconSize = KIconLoader::SizeHuge; + } + m_pixmap = KIconLoader::global()->loadIcon(QLatin1String(icon), KIconLoader::NoGroup, iconSize); if (m_hovered) { -- cgit v1.3