fix

1 files changed, 12 insertions, 4 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 99f547a..667ff2a 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -133,49 +133,49 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
         QFont nFont = p->font();
    
         if (!KGlobal::locale()->use12Clock())
             suffix = "00";
        
         if ( timeHeight >  mCellHeight ) {
             timeHeight = mCellHeight-1;
             int pointS = nFont.pointSize();
             while ( pointS > 4 ) {
                 nFont.setPointSize( pointS );
                 fm = QFontMetrics( nFont );
                 if ( fm.ascent() < mCellHeight )
                     break;
                 -- pointS;
             }
             fm = QFontMetrics( nFont );
             timeHeight = fm.ascent();
         }
         //timeHeight -= (timeHeight/4-2); 
         QFont sFont = nFont;
         sFont.setPointSize( sFont.pointSize()/2 );
         QFontMetrics fmS(  sFont );
         int sHei = fmS.ascent() ;
         //sHei -= (sHei/4-2); 
-        int startW = this->width() - 2*frameWidth()-1;
+        int startW = this->width() - frameWidth()-2;
         int tw2 = fmS.width(suffix);
         while (y < cy + ch) {
             p->drawLine(cx,y,cw,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);
                 tw2 = fmS.width(suffix);
             }
 
             // center and draw the time label
             int timeWidth = fm.width(hour);
             int offset = startW - timeWidth - tw2 ;
             p->setFont( nFont );
             p->drawText(  offset, y+ timeHeight, hour);
             p->setFont( sFont ); 
             offset = startW - tw2+1;
             p->drawText( offset, y+ sHei, suffix);
 
@@ -186,52 +186,60 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
     } else {
         //qDebug("NO  redraw ");
     }
     // double buffer not yet implemented
     //bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP);
     //mRedrawNeeded = false;
 }
 
 /**
    Calculates the minimum width.
 */
 int TimeLabels::minimumWidth() const
 {
     return mMiniWidth;
 }
 
 /** updates widget's internal state */
 void TimeLabels::updateConfig()
 {
     mRedrawNeeded = true;
     // set the font
     //  config->setGroup("Fonts");
     //  QFont font = config->readFontEntry("TimeBar Font");
     setFont(KOPrefs::instance()->mTimeBarFont);
-    QString test = "20oo";
+    QString test = "20";
     if (KGlobal::locale()->use12Clock())
-        test = "12mi";
-    mMiniWidth = fontMetrics().width(test) + frameWidth()*2 +1 ;
+        test = "12";
+    mMiniWidth = fontMetrics().width(test);
+    if (KGlobal::locale()->use12Clock())
+        test = "pm";
+    else
+        test = "00";
+    QFont sFont = font();
+    sFont.setPointSize( sFont.pointSize()/2 );
+    QFontMetrics fmS(  sFont );
+    mMiniWidth += fmS.width( test ) + frameWidth()*2 +4 ;
     // update geometry restrictions based on new settings
     setFixedWidth( mMiniWidth );
   
     // 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);
 }
 
 /**  */
 void TimeLabels::setAgenda(KOAgenda* agenda)
 {
     mAgenda = agenda;
 }
  
 void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) 
 {
     mMouseDownY = e->pos().y();