-rw-r--r-- | korganizer/koagendaview.cpp | 1 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index d43712f..aa36553 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -811,24 +811,25 @@ void KOAgendaView::createDayLabels() | |||
811 | dayLabel->setFlat( true ); | 811 | dayLabel->setFlat( true ); |
812 | connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) ); | 812 | connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) ); |
813 | dayLabel->setFocusPolicy(NoFocus); | 813 | dayLabel->setFocusPolicy(NoFocus); |
814 | mDayLabelsList.append( dayLabel ); | 814 | mDayLabelsList.append( dayLabel ); |
815 | mLayoutDayLabels->addWidget(dayLabel); | 815 | mLayoutDayLabels->addWidget(dayLabel); |
816 | } | 816 | } |
817 | //dayLabel->hide();//test only | 817 | //dayLabel->hide();//test only |
818 | 818 | ||
819 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; | 819 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; |
820 | if ( offset < 0 ) offset = 0; | 820 | if ( offset < 0 ) offset = 0; |
821 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); | 821 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); |
822 | dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); | 822 | dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); |
823 | dayLabel->setFont( dlf ); | ||
823 | dayLabel->show(); | 824 | dayLabel->show(); |
824 | dayLabel->setCaption("last"); | 825 | dayLabel->setCaption("last"); |
825 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); | 826 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); |
826 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); | 827 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); |
827 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); | 828 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); |
828 | if ( !appendLabels ) { | 829 | if ( !appendLabels ) { |
829 | dayLabel = mDayLabelsList.next(); | 830 | dayLabel = mDayLabelsList.next(); |
830 | while ( dayLabel ) { | 831 | while ( dayLabel ) { |
831 | //qDebug("!dayLabel %d",dayLabel ); | 832 | //qDebug("!dayLabel %d",dayLabel ); |
832 | dayLabel->hide(); | 833 | dayLabel->hide(); |
833 | dayLabel = mDayLabelsList.next(); | 834 | dayLabel = mDayLabelsList.next(); |
834 | } | 835 | } |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 549ef2a..dd83d48 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -481,24 +481,25 @@ void KODayMatrix::dropEvent(QDropEvent *e) | |||
481 | void KODayMatrix::paintEvent(QPaintEvent * pevent) | 481 | void KODayMatrix::paintEvent(QPaintEvent * pevent) |
482 | { | 482 | { |
483 | if ( width() <= 0 || height() <= 0 ) | 483 | if ( width() <= 0 || height() <= 0 ) |
484 | return; | 484 | return; |
485 | if ( mPendingUpdateBeforeRepaint ) { | 485 | if ( mPendingUpdateBeforeRepaint ) { |
486 | updateViewTimed(); | 486 | updateViewTimed(); |
487 | mPendingUpdateBeforeRepaint = false; | 487 | mPendingUpdateBeforeRepaint = false; |
488 | } | 488 | } |
489 | if ( myPix.width() != width() || myPix.height()!=height() ) { | 489 | if ( myPix.width() != width() || myPix.height()!=height() ) { |
490 | myPix.resize(size() ); | 490 | myPix.resize(size() ); |
491 | } | 491 | } |
492 | QPainter p(&myPix); | 492 | QPainter p(&myPix); |
493 | p.setFont(font()); | ||
493 | 494 | ||
494 | QRect sz = frameRect(); | 495 | QRect sz = frameRect(); |
495 | int dheight = daysize.height(); | 496 | int dheight = daysize.height(); |
496 | int dwidth = daysize.width(); | 497 | int dwidth = daysize.width(); |
497 | int row,col; | 498 | int row,col; |
498 | int selw, selh; | 499 | int selw, selh; |
499 | bool isRTL = KOGlobals::self()->reverseLayout(); | 500 | bool isRTL = KOGlobals::self()->reverseLayout(); |
500 | 501 | ||
501 | // draw background and topleft frame | 502 | // draw background and topleft frame |
502 | p.fillRect(pevent->rect(), mDefaultBackColor); | 503 | p.fillRect(pevent->rect(), mDefaultBackColor); |
503 | p.setPen(mDefaultTextColor); | 504 | p.setPen(mDefaultTextColor); |
504 | p.drawRect(0, 0, sz.width()+1, sz.height()+1); | 505 | p.drawRect(0, 0, sz.width()+1, sz.height()+1); |