-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 | |||
@@ -438,18 +438,28 @@ QString KODayMatrix::getHolidayLabel(int offset) | |||
438 | qDebug("Wrong offset1 "); | 438 | qDebug("Wrong offset1 "); |
439 | return 0; | 439 | return 0; |
440 | } | 440 | } |
441 | return mHolidays[offset]; | 441 | return mHolidays[offset]; |
442 | } | 442 | } |
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 | // ---------------------------------------------------------------------------- |
451 | // M O U S E E V E N T H A N D L I N G | 461 | // M O U S E E V E N T H A N D L I N G |
452 | // ---------------------------------------------------------------------------- | 462 | // ---------------------------------------------------------------------------- |
453 | 463 | ||
454 | void KODayMatrix::mousePressEvent (QMouseEvent* e) | 464 | void KODayMatrix::mousePressEvent (QMouseEvent* e) |
455 | { | 465 | { |
@@ -637,17 +647,17 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
637 | 647 | ||
638 | int dheight = daysize.height(); | 648 | int dheight = daysize.height(); |
639 | int dwidth = daysize.width(); | 649 | int dwidth = daysize.width(); |
640 | int row,col; | 650 | int row,col; |
641 | int selw, selh; | 651 | int selw, selh; |
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 | ||
649 | // draw background and topleft frame | 659 | // draw background and topleft frame |
650 | p.fillRect(pevent->rect(), mDefaultBackColor); | 660 | p.fillRect(pevent->rect(), mDefaultBackColor); |
651 | p.setPen(mDefaultTextColor); | 661 | p.setPen(mDefaultTextColor); |
652 | p.drawRect(0, 0, sz.width()+1, sz.height()+1); | 662 | p.drawRect(0, 0, sz.width()+1, sz.height()+1); |
653 | int mSelStartT = mSelStart; | 663 | int mSelStartT = mSelStart; |