summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-15 09:19:15 (UTC)
committer zautrix <zautrix>2005-06-15 09:19:15 (UTC)
commit37175a31a8fa8772403e9588ff3f8bd7de3979cc (patch) (unidiff)
treed5e7210eaf5c0700e4957b898e01fb0f6dd73711
parent820a1285559d0bb5859f634ebc6865f3a85a93ab (diff)
downloadkdepimpi-37175a31a8fa8772403e9588ff3f8bd7de3979cc.zip
kdepimpi-37175a31a8fa8772403e9588ff3f8bd7de3979cc.tar.gz
kdepimpi-37175a31a8fa8772403e9588ff3f8bd7de3979cc.tar.bz2
fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp5
-rw-r--r--korganizer/koagendaitem.h1
2 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 1be0aca..e660c32 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -135,7 +135,7 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd )
135 mBackgroundColor.dark(),mBackgroundColor.light(), 135 mBackgroundColor.dark(),mBackgroundColor.light(),
136 mBackgroundColor.dark(),mBackgroundColor, black, mBackgroundColor) ; 136 mBackgroundColor.dark(),mBackgroundColor, black, mBackgroundColor) ;
137 setBackgroundColor( mBackgroundColor ); 137 setBackgroundColor( mBackgroundColor );
138 138 mWhiteText = (mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue() < 250);
139 mConflictItems.clear(); 139 mConflictItems.clear();
140 setCellXY(0,0,1); 140 setCellXY(0,0,1);
141 setCellXWidth(0); 141 setCellXWidth(0);
@@ -405,8 +405,7 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
405 h -=(AGENDA_ICON_SIZE+3); 405 h -=(AGENDA_ICON_SIZE+3);
406 } 406 }
407 } 407 }
408 int colsum = mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue(); 408 if ( mWhiteText )
409 if ( colsum < 250 )
410 paint->setPen ( white); 409 paint->setPen ( white);
411 if ( x < 0 ) { 410 if ( x < 0 ) {
412 w = w+x-3; 411 w = w+x-3;
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 53658c0..d1b1940 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -122,6 +122,7 @@ class KOAgendaItem : public QWidget
122 private: 122 private:
123 KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis; 123 KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis;
124 bool mAllDay; 124 bool mAllDay;
125 bool mWhiteText;
125 int mCellX; 126 int mCellX;
126 int mCellXWidth; 127 int mCellXWidth;
127 int mCellYTop,mCellYBottom; 128 int mCellYTop,mCellYBottom;