summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index a42d07b..c055eb8 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -128,7 +128,7 @@ void KOAgendaItem::initColor ()
QColor BackgroundColor ( mBackgroundColor );
if ( mIncidence->calID() > 1 ) {
- BackgroundColor = KOPrefs::instance()->defaultColor( mIncidence->calID() );
+ //BackgroundColor = KOPrefs::instance()->defaultColor( mIncidence->calID() );
}
mColorGroup = QColorGroup( BackgroundColor.light(),
BackgroundColor.dark(),BackgroundColor.light(),
@@ -200,6 +200,20 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
y = pos().y()+3;
else
y = mCellYTop * ( height() / cellHeight() ) +3;
+
+
+ if ( mIncidence->calID() > 1 ) {
+ p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, KOPrefs::instance()->defaultColor( mIncidence->calID() ) );
+ p->drawRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x-1, yOff*( 1 +AGENDA_ICON_SIZE)+y-1, AGENDA_ICON_SIZE+2, AGENDA_ICON_SIZE+2 );
+ if ( horLayout ){
+ ++xOff;
+ ++x;
+ }
+ else {
+ ++yOff;
+ ++y;
+ }
+ }
if (mIncidence->cancelled()) {
int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x;
int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y;