[Pkg-kde-commits] rev 1860 - in branches/kde-3.4.0/packages/kdebase/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-09-24 13:40:19 +0000 (Sat, 24 Sep 2005)
New Revision: 1860

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/changelog
   branches/kde-3.4.0/packages/kdebase/debian/patches/28_kdebase_rubberband.diff
Log:
Small addition that makes the rounded text selection added recently
apply to desktop icons as well. I can't make it misbehave as did Konqueror,
but again, PLEASE TEST to ensure there are no lurking issues, in case I
missed something. Thanks!


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-09-24 13:35:24 UTC (rev 1859)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-09-24 13:40:19 UTC (rev 1860)
@@ -1,3 +1,13 @@
+kdebase (4:3.4.2-4) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Add a small addition to the "Improving KDE" patch selection used in
+    Debian. The rounded icon text selection now applies on the desktop
+    as well. (Closes: #329484)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdebase (4:3.4.2-3) unstable; urgency=low
 
   * KDE_3_4_BRANCH update (up to r458655). This includes a fix for a local

Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/28_kdebase_rubberband.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/28_kdebase_rubberband.diff	2005-09-24 13:35:24 UTC (rev 1859)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/28_kdebase_rubberband.diff	2005-09-24 13:40:19 UTC (rev 1860)
@@ -359,3 +359,80 @@
     bool m_bTopLevelComplete:1;
     bool m_showIcons:1;
     bool m_bCaseInsensitive:1;
+--- kde.orig/kdesktop/kfileividesktop.cpp
++++ kde.patched/kdesktop/kfileividesktop.cpp
+@@ -133,40 +133,11 @@
+   return false;
+ }
+ 
+-void KFileIVIDesktop::paintFocus( QPainter *p, const QColorGroup &cg )
+-{
+-    if ( !iconView() )
+-        return;
+-
+-    if ( !m_shadow || !wordWrap() ||
+-         !( static_cast<KDesktopShadowSettings *>
+-             ( m_shadow->shadowSettings() ) )->isEnabled() ) {
+-        QIconViewItem::paintFocus( p, cg );
+-        return;
+-    }
+-
+-    int spread = shadowThickness();
+-
+-    iconView()->style().drawPrimitive( QStyle::PE_FocusRect, p,
+-        QRect( textRect( false ).x(), textRect( false ).y(),
+-               textRect( false ).width() - spread,
+-               textRect( false ).height() - spread + 1 ),
+-        cg,
+-        isSelected() ? QStyle::Style_FocusAtBorder : QStyle::Style_Default,
+-        QStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
+-
+-    if ( this != iconView()->currentItem() ) {
+-        iconView()->style().drawPrimitive( QStyle::PE_FocusRect, p,
+-            QRect( pixmapRect( false ).x(), pixmapRect( false ).y(),
+-            pixmapRect( false ).width(), pixmapRect( false ).height() ),
+-            cg, QStyle::Style_Default, QStyleOption( cg.base() ) );
+-    }
+-}
+ 
+ 
+ void KFileIVIDesktop::drawShadowedText( QPainter *p, const QColorGroup &cg )
+ {
+-  int textX = textRect( FALSE ).x() + 2;
++  int textX = textRect( FALSE ).x() + 4;
+   int textY = textRect( FALSE ).y();
+   int align = ((KIconView *) iconView())->itemTextPos() == QIconView::Bottom
+     ? AlignHCenter : AlignAuto;
+@@ -182,12 +153,15 @@
+   int spread = shadowThickness();
+ 
+   if ( isSelected() && settings->selectionType() != KShadowSettings::InverseVideoOnSelection ) {
+-    // select using a filled rect
+     text = cg.highlightedText();
+     QRect rect = textRect( false );
+     rect.setRight( rect.right() - spread );
+     rect.setBottom( rect.bottom() - spread + 1 );
+-    p->fillRect( rect, cg.highlight() );
++    p->setBrush( QBrush( cg.highlight() ) );
++    p->setPen( QPen( cg.highlight() ) );
++    p->drawRoundRect( rect,
++		      1000 / rect.width(),
++		      1000 / rect.height() );	
+   }
+   else {
+     // use shadow
+--- kde.orig/kdesktop/kfileividesktop.h
++++ kde.patched/kdesktop/kfileividesktop.h
+@@ -80,12 +80,7 @@
+     virtual void paintItem(QPainter *p, const QColorGroup &cg);
+ 
+     /**
+-     * Reimplements QIconView::paintFocus() to take the shadow
+-     * metrics into account();
+-     */
+-    virtual void paintFocus( QPainter *p, const QColorGroup &cg );
+ 
+-    /**
+      * Draws the shadow text.
+      * @param p the painter for drawing the item
+      * @param cg the base color group