nf

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
@@ -450,24 +450,26 @@ int KODayMatrix::getDayIndexFrom(int x, int y)
 // ----------------------------------------------------------------------------
 //  M O U S E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::mousePressEvent (QMouseEvent* e)
 {
   
     if ( e->button() == LeftButton )
         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)
 {
   if ( e->button() == LeftButton )
       if ( ! mouseDown ) {
           return;
       }
       else
           mouseDown = false; 
   int tmp = getDayIndexFrom(e->x(), e->y());
   if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
@@ -631,25 +633,25 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
     }
   QPainter p(&myPix);
   p.setFont(font());
 
 
   int dheight = daysize.height();
   int dwidth = daysize.width();
   int row,col;
   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
   p.fillRect(pevent->rect(), mDefaultBackColor);
   p.setPen(mDefaultTextColor);
   p.drawRect(0, 0, sz.width()+1, sz.height()+1);
   int mSelStartT = mSelStart;
   int mSelEndT = mSelEnd;
   if ( mSelEndT >=  NUMDAYS )
       mSelEndT = NUMDAYS-1;
   // draw selected days with highlighted background color
@@ -667,46 +669,28 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
                   mSelStartT += add +1;
               }
               if ( days[mSelEndT].month() != mo ) {
                   int sub = days[mSelEndT].day();
                   mSelEndT -= sub ;
               }
           }
       }
       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;
               }  
               if ( colModulo ) {
                   int colt1 = mSelEndT%7;
                   //qDebug("colt1 %d ", colt1 );
                   if ( colt1 >= 7 - colModulo )
                       addCol =  colt1 - 7 + colModulo+1; 
                   int colt = mSelStartT%7;
                   if ( colt >= 7 - colModulo )
@@ -783,41 +767,55 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
           continue;
           }
       }
       //Reset pen color after selected days block
       if (i == mSelEndT+1) {
           p.setPen(actcol);
       }
 
       // 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);
               } else {
                   mTodayPen.setColor(mHolidayColorShaded);
               }
           }
           //draw gray rectangle for today if in selection
           if (i >= mSelStartT && i <= mSelEndT) {
               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
       if (events[i] > 0) {
           QFont myFont = font();
           myFont.setBold(true);
           p.setFont(myFont);
       }
 
       // if it is a holiday then use the default holiday color
       if (!mHolidays[i].isNull()) {