1 files changed, 20 insertions, 22 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 507f18e..f864022 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -458,8 +458,10 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e)
         mouseDown = true; 
   mSelStart = getDayIndexFrom(e->x(), e->y());
   if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1;
   mSelInit = mSelStart;
+  mSelEnd = mSelStart;
+  repaint(false);
 }
 
 void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
 {
@@ -639,9 +641,9 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
   int selw, selh;
   int xyOff = frameWidth();
   int colModulo = sz.width()  % 7;
   int rowModulo = sz.height()  % 6;
-  //qDebug("off %d  col %d  row %d ",xyOff,colModulo,rowModulo  );
+  qDebug("col %d  row %d ",colModulo,rowModulo  );
   
   bool isRTL = KOGlobals::self()->reverseLayout();
 
   // draw background and topleft frame
@@ -675,30 +677,12 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
       if ( ! skip ) {
           row = mSelStartT/7;
           col = mSelStartT -row*7;
           QColor selcol = KOPrefs::instance()->mHighlightColor;
-
-
-
           int addCol = 0;
           int addRow = 0; 
           int addRow2 = 0; 
           int addCol2 = 0;
-#if 0
-          if ( colModulo ) {
-              if ( col >= 7 - colModulo )
-                  addCol = col - 7 + colModulo;
-          }
-          if ( rowModulo ) {
-              if ( row >= 6 - rowModulo )
-                  addRow = row - 5 + rowModulo;
-          }
-#endif
-
-
-
-
-
           if (row == mSelEndT/7) { 
               if ( rowModulo ) {
                   if ( row >= 6 - rowModulo )
                       addRow = row - 5 + rowModulo;
@@ -791,10 +775,12 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
       // if today then draw rectangle around day
       if (today == i) {
           tmppen = p.pen();
           QPen mTodayPen(p.pen());
-
-          mTodayPen.setWidth(mTodayMarginWidth);
+          if ( daysize.width() < 20 )
+              mTodayPen.setWidth(1);
+          else
+              mTodayPen.setWidth(mTodayMarginWidth);
           //draw red rectangle for holidays
           if (!mHolidays[i].isNull()) {
               if (actcol == mDefaultTextColor) {
                   mTodayPen.setColor(KOPrefs::instance()->mHolidayColor);
@@ -807,9 +793,21 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
               QColor grey("grey");
               mTodayPen.setColor(grey);
           }
           p.setPen(mTodayPen);
-          p.drawRect(col*dwidth, row*dheight, dwidth, dheight);
+
+
+          int addCol = 0;
+          int addRow = 0;
+          if (rowModulo) { 
+              if ( row >= 6 - rowModulo )
+                  addRow = row - 5 + rowModulo;
+          }  
+          if ( colModulo ) {
+              if ( col >= 7 - colModulo )
+                  addCol = col - 6 + colModulo-1;
+          }
+          p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight+1);
           p.setPen(tmppen);
       }
 
       // if any events are on that day then draw it using a bold font