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

List:       kde-commits
Subject:    kdebase/kicker/taskbar
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-04-19 20:04:24
Message-ID: 20050419200424.30E47651 () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

blendColors is now in kickerlib


  M +1 -16     taskcontainer.cpp   1.129
  M +0 -1      taskcontainer.h   1.49


--- kdebase/kicker/taskbar/taskcontainer.cpp  #1.128:1.129
@@ -370,19 +370,4 @@ QString TaskContainer::id()
 }
 
-QColor TaskContainer::blendColors( QColor c1, QColor c2 )
-{
-    int r1, g1, b1;
-    int r2, g2, b2;
-
-    c1.rgb( &r1, &g1, &b1 );
-    c2.rgb( &r2, &g2, &b2 );
-
-    r1 += (int) ( .5 * ( r2 - r1 ) );
-    g1 += (int) ( .5 * ( g2 - g1 ) );
-    b1 += (int) ( .5 * ( b2 - b1 ) );
-
-    return QColor( r1, g1, b1 );
-}
-
 void TaskContainer::paintEvent(QPaintEvent*)
 {
@@ -597,5 +582,5 @@ void TaskContainer::drawButton(QPainter 
         if (!TaskBarSettings::showOnlyIconified() && iconified)
         {
-            textPen = QPen(blendColors(colors.button(), colors.buttonText()));
+            textPen = QPen(KickerLib::blendColors(colors.button(), colors.buttonText()));
         }
         else if (!active)

--- kdebase/kicker/taskbar/taskcontainer.h  #1.48:1.49
@@ -95,5 +95,4 @@ protected:
 
     void updateFilteredTaskList();
-    QColor blendColors(QColor, QColor);
 
 protected slots:


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