[Kde-accessibility] kdepim/kontact/src

[Daniel Molkentin]

CVS commit by danimo: 

Keep the default text color. only the active item should be drawn using brightText().
This fails with the black/white and blue/yellow color schemes, but that seems like
a bug in those schemes, right?

CCMAIL:kde-accessibility at kde.org


  M +7 -12     iconsidepane.cpp   1.10


--- kdepim/kontact/src/iconsidepane.cpp  #1.9:1.10
@@ -95,4 +95,10 @@ void EntryItem::paint( QPainter *p )
   }
 
+  QColor save;
+  if ( isCurrent() || isSelected() ) {
+    save = p->pen().color();
+    p->setPen(listBox()->colorGroup().brightText());
+  }
+
   if ( !text().isEmpty() ) {
     QFontMetrics fm = p->fontMetrics();
@@ -103,4 +109,5 @@ void EntryItem::paint( QPainter *p )
   // draw sunken
   if ( isCurrent() || isSelected() ) {
+    p->setPen(save);
     QColorGroup group = box->colorGroup();
     group.setColor( QColorGroup::Dark, Qt::black );
@@ -114,18 +121,6 @@ Navigator::Navigator( SidePaneBase *pare
 {
   setSelectionMode( KListBox::Single );
-
   viewport()->setBackgroundMode( PaletteMid );
-
-  QPalette pal = palette();
-  QColor gray = colorGroup().shadow();
-  pal.setColor( QPalette::Normal, QColorGroup::Text, Qt::white );
-  pal.setColor( QPalette::Inactive, QColorGroup::Text, Qt::white );
-  pal.setColor( QPalette::Normal, QColorGroup::HighlightedText, Qt::white );
-  pal.setColor( QPalette::Inactive, QColorGroup::HighlightedText, Qt::white );
-
-  setPalette( pal );
-
   setHScrollBarMode( QScrollView::AlwaysOff );
-
   setAcceptDrops( true );