layout fix

1 files changed, 91 insertions, 30 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 9181936..15a1cb4 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -621,3 +621,4 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
 {
-    if ( width() <= 0  || height() <= 0 )
+  QRect sz = frameRect();
+    if ( sz.width() <= 0  || sz.height() <= 0 )
         return;
@@ -627,4 +628,4 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
     }
-    if ( myPix.width() != width() || myPix.height()!=height() ) {
-        myPix.resize(size() );
+    if ( myPix.width() != sz.width() || myPix.height()!=sz.height() ) {
+        myPix.resize(sz.size() );
     }
@@ -633,3 +634,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
 
-  QRect sz = frameRect();
+
   int dheight = daysize.height();
@@ -638,2 +639,7 @@ 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  );
+  
   bool isRTL = KOGlobals::self()->reverseLayout();
@@ -669,24 +675,65 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
       if ( ! skip ) {
-    row = mSelStartT/7;
-    col = mSelStartT -row*7;
-    QColor selcol = KOPrefs::instance()->mHighlightColor;
-
-    if (row == mSelEndT/7) {
-      // Single row selection
-      p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth,
-                  row*dheight, (mSelEndT-mSelStartT+1)*dwidth, dheight, selcol);
-    } else {
-      // draw first row to the right
-      p.fillRect(isRTL ? 0 : col*dwidth, row*dheight, (7-col)*dwidth,
-                 dheight, selcol);
-      // draw full block till last line
-      selh = mSelEndT/7-row;
-      if (selh > 1) {
-        p.fillRect(0, (row+1)*dheight, 7*dwidth, (selh-1)*dheight,selcol);
-      }
-      // draw last block from left to mSelEndT
-      selw = mSelEndT-7*(mSelEndT/7)+1;
-      p.fillRect(isRTL ? (7-selw)*dwidth : 0, (row+selh)*dheight,
-                 selw*dwidth, dheight, selcol);
-    }
+          row = mSelStartT/7;
+          col = mSelStartT -row*7;
+          QColor selcol = KOPrefs::instance()->mHighlightColor;
+
+
+
+          int addCol = 0;
+          int addRow = 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 ) {
+                  if ( mSelEndT-mSelStartT+1 >= 7 - colModulo )
+                      addCol =  mSelEndT-mSelStartT+1 - 7 + colModulo;
+              }
+              // Single row selection
+              if ( row == 0)
+                  addRow = 1;
+              p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1,
+                         row*dheight+addRow, (mSelEndT-mSelStartT+1)*dwidth+addCol, dheight+1, selcol);
+          } else {
+              // draw first row to the right
+              if ( row == 0)
+                  addRow = 1;
+              p.fillRect(isRTL ? 0 : col*dwidth+1, row*dheight+addRow, (7-col)*dwidth+colModulo,
+                         dheight, selcol);
+              // draw full block till last line
+              selh = mSelEndT/7-row;
+              if (selh > 1) {
+                  p.fillRect(1, (row+1)*dheight, 7*dwidth+colModulo, (selh-1)*dheight,selcol);
+              }
+              // draw last block from left to mSelEndT
+              selw = mSelEndT-7*(mSelEndT/7)+1;
+              //qDebug("esl %d ",selw );
+              int add = 0;
+              if ( colModulo ) {
+                  add = 7 - colModulo;
+                  if ( selw > add )
+                      add = selw - add;
+                  else
+                      add = 0;
+              }
+              //qDebug("add %d ", add);
+              p.fillRect(isRTL ? (7-selw)*dwidth : 1, (row+selh)*dheight,
+                         selw*dwidth+add, dheight, selcol);
+          }
       }
@@ -771,3 +818,15 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
 
-      p.drawText(col*dwidth, row*dheight, dwidth, dheight,
+      int addCol = 0;
+      int addRow = 0;
+      if ( colModulo ) {
+          if ( col >= 7 - colModulo )
+              addCol = col - 7 + colModulo;
+      }
+      if ( rowModulo ) {
+          if ( row >= 6 - rowModulo )
+              addRow = row - 5 + rowModulo;
+      }
+      //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow);
+      ++addCol;++addCol;
+      p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight,
                  Qt::AlignHCenter | Qt::AlignVCenter,  daylbls[i]);
@@ -785,3 +844,5 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
   }
-    bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); 
+  int off = xyOff;
+    bitBlt (this, off, off, &myPix, 0 ,0,width(), height() ,CopyROP); 
+    //qDebug("ffffffffff %d ", off);
 }
@@ -803,4 +864,4 @@ QSize KODayMatrix::sizeHint() const
   QFontMetrics fm ( font() );
-  int wid = fm.width( "30") *7+7;
-  int hei = fm.height() * 6+4;
+  int wid = fm.width( "30") *7+3;
+  int hei = fm.height() * 6+3;
   //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei);