fix

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
@@ -35,202 +35,205 @@
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
 
 #include <kapplication.h>
 #include <KDGanttMinimizeSplitter.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include "calendarview.h"
 #include "koviewmanager.h"
 
 #include <libkcal/calendar.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/dndfactory.h>
 
 #include <kcalendarsystem.h>
 
 #include "koglobals.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koprefs.h"
 #include "koagenda.h"
 #include "koagendaitem.h"
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 
 #include "koagendaview.h"
 //#include "koagendaview.moc"
 
 //extern bool globalFlagBlockPainting;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockLabel;
 using namespace KOrg;
 
 
 
 TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
     QScrollView(parent,name,f)
 {
     mRows = rows;
 
     setMinimumHeight( 20 );
     mCellHeight = KOPrefs::instance()->mHourSize*4;
 
     enableClipper(true);
 
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
 
     resizeContents(50,mRows * mCellHeight);
 
     viewport()->setBackgroundMode( PaletteBackground );
 }
 
 void TimeLabels::setCellHeight(int height)
 {
     mCellHeight = height;
 }
 
 /*
   Optimization so that only the "dirty" portion of the scroll view
   is redrawn.  Unfortunately, this is not called by default paintEvent() method.
 */
 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 ); 
         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;
 }
 
 /** updates widget's internal state */
 void TimeLabels::updateConfig()
 {
     // set the font
     //  config->setGroup("Fonts");
     //  QFont font = config->readFontEntry("TimeBar Font");
     setFont(KOPrefs::instance()->mTimeBarFont);
 
     // 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);
 }
 
 /**  */
 void TimeLabels::setAgenda(KOAgenda* agenda)
 {
     mAgenda = agenda;
 }
  
 void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) 
 {
     mMouseDownY = e->pos().y();
     mOrgCap = topLevelWidget()->caption();
 }
   
 void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) 
 {
   int diff = mMouseDownY -  e->pos().y();
     if ( diff < 10 && diff > -10 )
         return;
     int tSize = KOPrefs::instance()->mHourSize + (diff/10) ;
     if ( tSize  < 4 )
         tSize = 4;
     if ( tSize > 22 )
         tSize = 22;
     tSize = (tSize-2)/2;
     topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize));