author | zautrix <zautrix> | 2005-06-15 09:19:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-15 09:19:15 (UTC) |
commit | 37175a31a8fa8772403e9588ff3f8bd7de3979cc (patch) (unidiff) | |
tree | d5e7210eaf5c0700e4957b898e01fb0f6dd73711 /korganizer/koagendaitem.cpp | |
parent | 820a1285559d0bb5859f634ebc6865f3a85a93ab (diff) | |
download | kdepimpi-37175a31a8fa8772403e9588ff3f8bd7de3979cc.zip kdepimpi-37175a31a8fa8772403e9588ff3f8bd7de3979cc.tar.gz kdepimpi-37175a31a8fa8772403e9588ff3f8bd7de3979cc.tar.bz2 |
fix
-rw-r--r-- | korganizer/koagendaitem.cpp | 5 |
1 files changed, 2 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 | |||
@@ -130,17 +130,17 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd ) | |||
130 | } | 130 | } |
131 | } | 131 | } |
132 | 132 | ||
133 | } | 133 | } |
134 | mColorGroup = QColorGroup( mBackgroundColor.light(), | 134 | mColorGroup = QColorGroup( mBackgroundColor.light(), |
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); |
142 | setSubCell(0); | 142 | setSubCell(0); |
143 | setSubCells(1); | 143 | setSubCells(1); |
144 | setMultiItem(0,0,0); | 144 | setMultiItem(0,0,0); |
145 | startMove(); | 145 | startMove(); |
146 | mSelected = true; | 146 | mSelected = true; |
@@ -400,18 +400,17 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint ) | |||
400 | x += AGENDA_ICON_SIZE+3; | 400 | x += AGENDA_ICON_SIZE+3; |
401 | w -= (AGENDA_ICON_SIZE+3); | 401 | w -= (AGENDA_ICON_SIZE+3); |
402 | } | 402 | } |
403 | else { | 403 | else { |
404 | yy+= AGENDA_ICON_SIZE+2; | 404 | yy+= AGENDA_ICON_SIZE+2; |
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; |
413 | x = 3; | 412 | x = 3; |
414 | if ( w > parentWidget()->width() ){ | 413 | if ( w > parentWidget()->width() ){ |
415 | w = parentWidget()->width() - 6; | 414 | w = parentWidget()->width() - 6; |
416 | #ifndef DESKTOP_VERSION | 415 | #ifndef DESKTOP_VERSION |
417 | align = ( AlignHCenter|WordBreak|AlignTop); | 416 | align = ( AlignHCenter|WordBreak|AlignTop); |