summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-20 20:24:06 (UTC)
committer zautrix <zautrix>2005-03-20 20:24:06 (UTC)
commitb32c8de5dcd6c4f8dce9415fb686970e2c991ebb (patch) (side-by-side diff)
treeee5ba00bcc830d011a816981fd20dcf781b9cbf5
parent64068741e3b82a34c1b8a67da412ac88841b640c (diff)
downloadkdepimpi-b32c8de5dcd6c4f8dce9415fb686970e2c991ebb.zip
kdepimpi-b32c8de5dcd6c4f8dce9415fb686970e2c991ebb.tar.gz
kdepimpi-b32c8de5dcd6c4f8dce9415fb686970e2c991ebb.tar.bz2
nf
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/kodaymatrix.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index f864022..ae0a051 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -440,14 +440,24 @@ QString KODayMatrix::getHolidayLabel(int offset)
}
return mHolidays[offset];
}
int KODayMatrix::getDayIndexFrom(int x, int y)
{
+ int colModulo = (width()-2) % 7;
+ int rowModulo = (height()-2) % 6;
+#if 0
return 7*(y/daysize.height()) + (KOGlobals::self()->reverseLayout() ?
6 - x/daysize.width() : x/daysize.width());
+#endif
+ int xVal = (x-colModulo/2-2)/daysize.width();
+ int yVal = (y-rowModulo/2-2)/daysize.height();
+
+
+ return 7*(yVal) + xVal;
+
}
// ----------------------------------------------------------------------------
// M O U S E E V E N T H A N D L I N G
// ----------------------------------------------------------------------------
@@ -639,13 +649,13 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
int dwidth = daysize.width();
int row,col;
int selw, selh;
int xyOff = frameWidth();
int colModulo = sz.width() % 7;
int rowModulo = sz.height() % 6;
- qDebug("col %d row %d ",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);