[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/libkdepim
From:       Olivier Trichet <nive () nivalis ! org>
Date:       2009-06-09 18:46:55
Message-ID: 1244573215.701875.14321.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 979421 by otrichet:

With custom text elision (KNode's one), there is a blanck between label and unread \
count.

REVIEW: http://reviewboard.kde.org/r/794/

 M  +14 -17    foldertreewidget.cpp  


--- trunk/KDE/kdepim/libkdepim/foldertreewidget.cpp #979420:979421
@@ -136,7 +136,7 @@
         {
           if ( displayChildUnread )
             unreadText = QString("(%1 + %2)").arg( unread ).arg( childUnread );
-          else 
+          else
             unreadText = QString("(%1)").arg( unread );
         } else
           unreadText = QString("(0 + %1)").arg( childUnread );
@@ -147,32 +147,29 @@
         int labelWidth = fm.width( item->labelText() );
         int maxWidth = labelWidth + ITEM_LABEL_TO_UNREADCOUNT_SPACING + unreadWidth;
 
-        if ( maxWidth > textRect.width() ) 
+        QString label;
+        if ( maxWidth > textRect.width() )
         {
           // must elide
-          QString label = item->elidedLabelText( fm, textRect.width() - ( \
ITEM_LABEL_TO_UNREADCOUNT_SPACING + unreadWidth ) ); +          label = \
item->elidedLabelText( fm, textRect.width() - ( ITEM_LABEL_TO_UNREADCOUNT_SPACING + \
unreadWidth ) ); +          labelWidth = fm.width( label );
 
           // the condition inside this call is an optimisation (it's faster than \
                simply label != item->labelText())
           item->setLabelTextElided( ( label.length() != item->labelText().length() ) \
                || ( label != item->labelText() ) );
-
-          painter->drawText( textRect, Qt::AlignLeft | Qt::TextSingleLine | \
                Qt::AlignVCenter, label );
-
-          if ( !( opt.state & QStyle::State_Selected ) )
-            painter->setPen( QPen( mFolderTreeWidget->unreadCountColor(), 0 ) );
-          painter->drawText( textRect, Qt::AlignRight | Qt::TextSingleLine | \
                Qt::AlignVCenter, unreadText );
-
         } else {
+          label = item->labelText();
           // no elision needed
           item->setLabelTextElided( false );
+        }
 
-          painter->drawText( textRect, Qt::AlignLeft | Qt::TextSingleLine | \
Qt::AlignVCenter, item->labelText() ); +        painter->drawText( textRect, \
Qt::AlignLeft | Qt::TextSingleLine | Qt::AlignVCenter, label );  
-          textRect.setLeft( textRect.left() + labelWidth + \
ITEM_LABEL_TO_UNREADCOUNT_SPACING ); +        textRect.setLeft( textRect.left() + \
labelWidth + ITEM_LABEL_TO_UNREADCOUNT_SPACING );  
-          if ( !( opt.state & QStyle::State_Selected ) )
-            painter->setPen( QPen( mFolderTreeWidget->unreadCountColor(), 0 ) );
-          painter->drawText( textRect, Qt::AlignLeft | Qt::TextSingleLine | \
Qt::AlignVCenter, unreadText ); +        if ( !( opt.state & QStyle::State_Selected ) \
) { +          painter->setPen( QPen( mFolderTreeWidget->unreadCountColor(), 0 ) );
         }
+        painter->drawText( textRect, Qt::AlignLeft | Qt::TextSingleLine | \
Qt::AlignVCenter, unreadText );  } else {
         // got unread messages: bold font but no special text tricks
         QString label = item->elidedLabelText( fm, textRect.width() );
@@ -409,7 +406,7 @@
   mChildrenUnreadCount = 0;
   mChildrenDataSize = 0;
 
-  bool gotValidDataSize = false;  
+  bool gotValidDataSize = false;
 
   while ( idx < cc )
   {
@@ -445,7 +442,7 @@
   int idx = tree->labelColumnIndex();
   if ( tree && idx >= 0 )
   {
-    setText( idx, label );  
+    setText( idx, label );
     setTextAlignment( idx, Qt::AlignRight );
   }
 }


[prev in list] [next in list] [prev in thread] [next in thread]