summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/kodaymatrix.cpp42
1 files changed, 32 insertions, 10 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 15a1cb4..507f18e 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -642,3 +642,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
int rowModulo = sz.height() % 6;
- qDebug("off %d col %d row %d ",xyOff,colModulo,rowModulo );
+ //qDebug("off %d col %d row %d ",xyOff,colModulo,rowModulo );
@@ -683,2 +683,4 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
int addRow = 0;
+ int addRow2 = 0;
+ int addCol2 = 0;
#if 0
@@ -704,4 +706,11 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
if ( colModulo ) {
- if ( mSelEndT-mSelStartT+1 >= 7 - colModulo )
- addCol = mSelEndT-mSelStartT+1 - 7 + 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 )
+ addCol2 = colt - 7 + colModulo;
+ addCol -= addCol2;
+ //qDebug("COL %d %d %d %d ",col , colt1 ,addCol ,addCol2 );
}
@@ -710,3 +719,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
addRow = 1;
- p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1,
+ p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1+addCol2,
row*dheight+addRow, (mSelEndT-mSelStartT+1)*dwidth+addCol, dheight+1, selcol);
@@ -714,10 +723,23 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
// draw first row to the right
+ if ( colModulo ) {
+ if ( col >= 7 - colModulo )
+ addCol2 = col - 7 + colModulo;
+ }
+ if ( rowModulo ) {
+ if ( row >= 6 - rowModulo )
+ addRow = row - 5 + rowModulo;
+ }
if ( row == 0)
addRow = 1;
- p.fillRect(isRTL ? 0 : col*dwidth+1, row*dheight+addRow, (7-col)*dwidth+colModulo,
- dheight, selcol);
+ p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, (7-col)*dwidth+colModulo,
+ dheight+1, selcol);
// draw full block till last line
selh = mSelEndT/7-row;
+ addRow = 0;
+ if ( rowModulo ) {
+ if ( mSelEndT/7 >= 6 - rowModulo )
+ addRow = mSelEndT/7 - 5 + rowModulo;
+ }
if (selh > 1) {
- p.fillRect(1, (row+1)*dheight, 7*dwidth+colModulo, (selh-1)*dheight,selcol);
+ p.fillRect(1, (row+1)*dheight, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol);
}
@@ -735,4 +757,4 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
//qDebug("add %d ", add);
- p.fillRect(isRTL ? (7-selw)*dwidth : 1, (row+selh)*dheight,
- selw*dwidth+add, dheight, selcol);
+ p.fillRect(isRTL ? (7-selw)*dwidth : 1, (row+selh)*dheight+addRow,
+ selw*dwidth+add, dheight+1, selcol);
}
@@ -829,3 +851,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
//qDebug("add %d %d -- %d %d ", col, addCol, row, addRow);
- ++addCol;++addCol;
+ ++addCol;//++addCol;
p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight,