-rw-r--r-- | korganizer/koagendaview.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 957ac52..b9c7dec 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -116,33 +116,33 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) // 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(); timeHeight -= (timeHeight/4-2); - int borderWidth = 5; + int borderWidth = 2; 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); @@ -166,51 +166,43 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) p->drawText(cx - borderWidth + offset, y+ timeHeight, fullTime); p->setFont( sFont ); offset += timeWidth; p->drawText(cx - borderWidth + offset, y+ sHei, suffix); // increment indices y += mCellHeight; cell++; } } /** Calculates the minimum width. */ int TimeLabels::minimumWidth() const { - QFontMetrics fm = fontMetrics(); - - //TODO: calculate this value - int borderWidth = 4; - - // the maximum width possible - int width = fm.width("88:88x") + borderWidth; - - return width; + return mMiniWidth; } /** updates widget's internal state */ void TimeLabels::updateConfig() { // set the font // config->setGroup("Fonts"); // QFont font = config->readFontEntry("TimeBar Font"); setFont(KOPrefs::instance()->mTimeBarFont); - + mMiniWidth = fontMetrics().width("88:88") + 2 ; // update geometry restrictions based on new settings setFixedWidth(minimumWidth()); // update HourSize mCellHeight = KOPrefs::instance()->mHourSize*4; resizeContents(50,mRows * mCellHeight); } /** update time label positions */ void TimeLabels::positionChanged() { int adjustment = mAgenda->contentsY(); setContentsPos(0, adjustment); } /** */ |