From 83e845857283fe358635b48709c649f90665edc6 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 20 Sep 2010 17:18:56 +0000 Subject: Fixed user configurability of icon text box corners git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1177588 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdesktop/kfileividesktop.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'kdesktop/kfileividesktop.cpp') diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/kfileividesktop.cpp index 90c6a213d..d5e367bc0 100644 --- a/kdesktop/kfileividesktop.cpp +++ b/kdesktop/kfileividesktop.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include "kdesktopshadowsettings.h" @@ -138,7 +139,13 @@ bool KFileIVIDesktop::shouldUpdateShadow(bool selected) void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg ) { - int textX = textRect( FALSE ).x() + 4; + bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect(); + + int textX; + if (drawRoundedRect == true) + textX = textRect( FALSE ).x() + 4; + else + textX = textRect( FALSE ).x() + 2; int textY = textRect( FALSE ).y(); int align = ((KIconView *) iconView())->itemTextPos() == TQIconView::Bottom ? AlignHCenter : AlignAuto; @@ -159,11 +166,16 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg ) TQRect rect = textRect( false ); rect.setRight( rect.right() - spread ); rect.setBottom( rect.bottom() - spread + 1 ); - p->setBrush( TQBrush( cg.highlight() ) ); - p->setPen( TQPen( cg.highlight() ) ); - p->drawRoundRect( rect, + if (drawRoundedRect == true) { + p->setBrush( TQBrush( cg.highlight() ) ); + p->setPen( TQPen( cg.highlight() ) ); + p->drawRoundRect( rect, 1000 / rect.width(), - 1000 / rect.height() ); + 1000 / rect.height() ); + } + else { + p->fillRect( textRect( false ), cg.highlight() ); + } } else { // use shadow -- cgit v1.2.1