From e4170c1910ad91fd31bc64edfab17ddc814411d5 Mon Sep 17 00:00:00 2001 From: Rafael Fernández López Date: Tue, 25 Dec 2007 17:37:41 +0000 Subject: Fixes, fixes, fixes: * Better item appearance (selected and hover) on systemsettings. * Keyboard navigation improved in dolphin, and now is possible to navigate with keyboard in systemsettings (it was not possible before). * No rubberband or multiple selection on systemsettings. * Single or double click for item activation depends on the system state on systemsettings. * On KCategoryDrawer now titles are drawn with more margin, as happens on DolphinCategoryDrawer. This gives more consistency to its look. CCMAIL: wstephenson@kde.org svn path=/trunk/KDE/kdebase/apps/; revision=752784 --- src/kcategorydrawer.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/kcategorydrawer.cpp') diff --git a/src/kcategorydrawer.cpp b/src/kcategorydrawer.cpp index d0c671915..53cf059f1 100644 --- a/src/kcategorydrawer.cpp +++ b/src/kcategorydrawer.cpp @@ -23,6 +23,7 @@ #include #include +#include #include KCategoryDrawer::KCategoryDrawer() @@ -61,6 +62,17 @@ void KCategoryDrawer::drawCategory(const QModelIndex &index, opt.direction = option.direction; opt.text = category; + int iconSize = KIconLoader::global()->currentSize(KIconLoader::Small); + + if (option.direction == Qt::LeftToRight) + { + opt.rect.setLeft(opt.rect.left() + (iconSize / 4)); + } + else + { + opt.rect.setRight(opt.rect.width() - (iconSize / 4)); + } + if (option.state & QStyle::State_Selected) { QColor selected = option.palette.color(QPalette::Highlight); @@ -113,7 +125,7 @@ void KCategoryDrawer::drawCategory(const QModelIndex &index, painter->setPen(color); - painter->drawText(option.rect, Qt::AlignVCenter | Qt::AlignLeft, + painter->drawText(opt.rect, Qt::AlignVCenter | Qt::AlignLeft, metrics.elidedText(category, Qt::ElideRight, option.rect.width())); painter->restore(); -- cgit v1.3