summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-01 19:05:18 (UTC)
committer zautrix <zautrix>2005-04-01 19:05:18 (UTC)
commit1022d8763a5185c74d1fb1fba9857d6e3afd9ff5 (patch) (side-by-side diff)
tree116b7ac7aef10e27c20ce30f3bae548ebde84da0
parentedc032c21ae3788d02a632ea8066e4ac5a4feedb (diff)
downloadkdepimpi-1022d8763a5185c74d1fb1fba9857d6e3afd9ff5.zip
kdepimpi-1022d8763a5185c74d1fb1fba9857d6e3afd9ff5.tar.gz
kdepimpi-1022d8763a5185c74d1fb1fba9857d6e3afd9ff5.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp30
-rw-r--r--korganizer/kodaymatrix.cpp4
2 files changed, 16 insertions, 18 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 072d464..99f547a 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -126,59 +126,55 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
int cell = ((int)(cy/mCellHeight));
int y = cell * mCellHeight;
QFontMetrics fm = fontMetrics();
QString hour;
QString suffix;
- int tW = fm.width("24:00i");
- int timeHeight = fm.height();
- //timeHeight -= (timeHeight/4-2);
- int borderWidth = 0;
+ int timeHeight = fm.ascent();
QFont nFont = p->font();
if (!KGlobal::locale()->use12Clock())
suffix = "00";
- else
- borderWidth = 0;
+
if ( timeHeight > mCellHeight ) {
timeHeight = mCellHeight-1;
int pointS = nFont.pointSize();
while ( pointS > 4 ) {
nFont.setPointSize( pointS );
fm = QFontMetrics( nFont );
- if ( fm.height() < mCellHeight )
+ if ( fm.ascent() < mCellHeight )
break;
-- pointS;
}
fm = QFontMetrics( nFont );
- borderWidth = 4;
- timeHeight = fm.height();
+ timeHeight = fm.ascent();
}
//timeHeight -= (timeHeight/4-2);
QFont sFont = nFont;
- sFont.setPointSize( sFont.pointSize()/2+2 );
+ sFont.setPointSize( sFont.pointSize()/2 );
QFontMetrics fmS( sFont );
- int sHei = fmS.height();
+ int sHei = fmS.ascent() ;
//sHei -= (sHei/4-2);
- int startW = this->width() - frameWidth()-1;
+ int startW = this->width() - 2*frameWidth()-1;
+ int tw2 = fmS.width(suffix);
while (y < cy + ch) {
- p->drawLine(cx,y,cx+tW,y);
+ 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 tw2 = fm.width(suffix);
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);
@@ -208,18 +204,18 @@ void TimeLabels::updateConfig()
{
mRedrawNeeded = true;
// set the font
// config->setGroup("Fonts");
// QFont font = config->readFontEntry("TimeBar Font");
setFont(KOPrefs::instance()->mTimeBarFont);
- QString test = "88:88";
+ QString test = "20oo";
if (KGlobal::locale()->use12Clock())
- test += "i";
+ test = "12mi";
mMiniWidth = fontMetrics().width(test) + frameWidth()*2 +1 ;
// update geometry restrictions based on new settings
- setFixedWidth(minimumWidth());
+ setFixedWidth( mMiniWidth );
// update HourSize
mCellHeight = KOPrefs::instance()->mHourSize*4;
resizeContents(50,mRows * mCellHeight);
}
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index c55f7d7..5b5703f 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -874,13 +874,15 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
if ( colModulo ) {
if ( col >= 7 - colModulo )
addCol = col - 6 + colModulo-1;
}
addCol += 1;
- p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight+1);
+ if ( row == 0 )
+ addRow = 1;
+ p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth+1, dheight+1);
p.setPen(tmppen);
}
// if any events are on that day then draw it using a bold font
if ( eDays.testBit(i) ) {
QFont myFont = font();