-rw-r--r-- | korganizer/kodaymatrix.cpp | 12 |
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 | |||
@@ -443,8 +443,18 @@ QString KODayMatrix::getHolidayLabel(int offset) | |||
443 | 443 | ||
444 | int KODayMatrix::getDayIndexFrom(int x, int y) | 444 | int KODayMatrix::getDayIndexFrom(int x, int y) |
445 | { | 445 | { |
446 | int colModulo = (width()-2) % 7; | ||
447 | int rowModulo = (height()-2) % 6; | ||
448 | #if 0 | ||
446 | return 7*(y/daysize.height()) + (KOGlobals::self()->reverseLayout() ? | 449 | return 7*(y/daysize.height()) + (KOGlobals::self()->reverseLayout() ? |
447 | 6 - x/daysize.width() : x/daysize.width()); | 450 | 6 - x/daysize.width() : x/daysize.width()); |
451 | #endif | ||
452 | int xVal = (x-colModulo/2-2)/daysize.width(); | ||
453 | int yVal = (y-rowModulo/2-2)/daysize.height(); | ||
454 | |||
455 | |||
456 | return 7*(yVal) + xVal; | ||
457 | |||
448 | } | 458 | } |
449 | 459 | ||
450 | // ---------------------------------------------------------------------------- | 460 | // ---------------------------------------------------------------------------- |
@@ -642,7 +652,7 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
642 | int xyOff = frameWidth(); | 652 | int xyOff = frameWidth(); |
643 | int colModulo = sz.width() % 7; | 653 | int colModulo = sz.width() % 7; |
644 | int rowModulo = sz.height() % 6; | 654 | int rowModulo = sz.height() % 6; |
645 | qDebug("col %d row %d ",colModulo,rowModulo ); | 655 | //qDebug("col %d row %d ",colModulo,rowModulo ); |
646 | 656 | ||
647 | bool isRTL = KOGlobals::self()->reverseLayout(); | 657 | bool isRTL = KOGlobals::self()->reverseLayout(); |
648 | 658 | ||