------- You are receiving this mail because: ------- You are on the CC list for the bug, or are watching someone who is. http://bugs.kde.org/show_bug.cgi?id=76148 b.walter free fr changed: What |Removed |Added ---------------------------------------------------------------------------- Status|UNCONFIRMED |RESOLVED Resolution| |FIXED ------- Additional Comments From b.walter free fr 2004-04-14 02:08 ------- CVS commit by bwalter: Select desktop icons using highlight color CCMAIL: 76148-done bugs kde org M +31 -28 kfileividesktop.cpp 1.2 --- kdebase/kdesktop/kfileividesktop.cpp #1.1:1.2 @ -71,5 +71,5 @ void KFileIVIDesktop::paintItem( QPainte if ( !view->wordWrapIconText() ) { - QIconViewItem::paintItem( p, colors ); + KIconViewItem::paintItem( p, colors ); return; } @ -113,5 +113,5 @ bool KFileIVIDesktop::shouldUpdateShadow } -void KFileIVIDesktop::drawShadowedText( QPainter *p, const QColorGroup &) +void KFileIVIDesktop::drawShadowedText( QPainter *p, const QColorGroup &cg ) { int textX = textRect( FALSE ).x() + 1; @ -130,22 +130,25 @ void KFileIVIDesktop::drawShadowedText( QColor text; - if (isSelected()) { - if (settings->selectionType() == KShadowSettings::InverseVideoOnSelection) { + if ( isSelected() && settings->selectionType() != KShadowSettings::InverseVideoOnSelection ) { + // select using a filled rect + text = cg.highlightedText(); + p->fillRect( textRect( false ), cg.highlight() ); + } + else { + // use shadow + if ( isSelected() ) { + // inverse text and shadow colors shadow = settings->textColor(); text = settings->bgColor(); - } else { - text = settings->textColor(); - shadow = settings->bgColor(); - } - if (rebuild == true) { - setSelectedImage(buildShadow(p, align, spread, shadow)); + if ( rebuild ) { + setSelectedImage( buildShadow( p, align, spread, shadow ) ); _selectedUID = uid; } - } else { + } + else { text = settings->textColor(); - shadow = (settings->bgColor().isValid()) ? settings->bgColor() : - (qGray(text.rgb()) > 127) ? black : white; - - if (rebuild == true) { + shadow = ( settings->bgColor().isValid() ) ? settings->bgColor() : + ( qGray( text.rgb() ) > 127 ) ? black : white; + if (rebuild) { setNormalImage(buildShadow(p, align, spread, shadow)); _normalUID = uid; @ -160,4 +163,5 @ void KFileIVIDesktop::drawShadowedText( (isSelected()) ? *selectedImage() : *normalImage(), 0, 0, -1, -1, DITHER_FLAGS); + } // draw the text