| -rw-r--r-- | korganizer/koagendaview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index f287216..957ac52 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -107,58 +107,61 @@ void TimeLabels::setCellHeight(int height) */ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) { // if ( globalFlagBlockAgenda ) // return; // bug: the parameters cx, cy, cw, ch are the areas that need to be // redrawn, not the area of the widget. unfortunately, this // code assumes the latter... // now, for a workaround... // these two assignments fix the weird redraw bug cx = contentsX() + 2; cw = contentsWidth() - 2; // end of workaround int cell = ((int)(cy/mCellHeight)); int y = cell * mCellHeight; QFontMetrics fm = fontMetrics(); QString hour; QString suffix; QString fullTime; int tW = fm.width("24:00i"); int timeHeight = fm.height(); - if ( timeHeight > mCellHeight ) - timeHeight = mCellHeight-1; + timeHeight -= (timeHeight/4-2); int borderWidth = 5; QFont nFont = p->font(); QFont sFont = nFont; sFont.setPointSize( sFont.pointSize()/2+2 ); if (!KGlobal::locale()->use12Clock()) suffix = "00"; QFontMetrics fmS( sFont ); int sHei = fmS.height(); + if ( timeHeight > mCellHeight ) { + timeHeight = mCellHeight-1; + sHei -= 2; + } while (y < cy + ch) { p->drawLine(cx,y,cx+tW,y); hour.setNum(cell); // handle 24h and am/pm time formats if (KGlobal::locale()->use12Clock()) { if (cell > 11) suffix = "pm"; else suffix = "am"; if (cell == 0) hour.setNum(12); if (cell > 12) hour.setNum(cell - 12); } // create string in format of "XX:XX" or "XXpm/am" fullTime = hour;// + suffix; // center and draw the time label int timeWidth = fm.width(fullTime+"i"); int tw2 = fm.width(suffix); int offset = this->width() - timeWidth - tw2; p->setFont( nFont ); p->drawText(cx - borderWidth + offset, y+ timeHeight, fullTime); p->setFont( sFont ); |