1 files changed, 7 insertions, 11 deletions

diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 6bdee18..78d4027 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -326,26 +326,22 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
       QString cat = categories.first();
       if ( !cat.isEmpty()) {
           colorToSet = *(KOPrefs::instance()->categoryColor(cat) );
       } else
           setColor = false;  
   }
-  if (mTodo->hasDueDate()) {
-    if (mTodo->dtDue().date()==QDate::currentDate() &&
-        !mTodo->isCompleted()) {
-        //_cg.setColor( role , KOPrefs::instance()->mTodoDueTodayColor); 
-        colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
-        setColor = true;
-    }
-    if (mTodo->dtDue().date() < QDate::currentDate() &&
-        !mTodo->isCompleted()) {
-        //_cg.setColor( role, KOPrefs::instance()->mTodoOverdueColor);
+
+   int odue = mTodo->hasDueSubTodo( !isOpen());
+   if (odue == 2) {
         colorToSet = KOPrefs::instance()->mTodoOverdueColor;
         setColor = true;
+   } else if ( odue == 1 ) {
+       colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
+       setColor = true;
     }
-  } 
+ 
 
   if ( setColor ) {
       _cg.setColor(role,colorToSet );
       if ( role == QColorGroup::Base) {
           int rgb = colorToSet.red();
           rgb += colorToSet.blue()/2;