| -rw-r--r-- | korganizer/koagendaview.cpp | 16 | ||||
| -rw-r--r-- | microkde/KDGanttMinimizeSplitter.cpp | 7 |
2 files changed, 16 insertions, 7 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 99f547a..667ff2a 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -153,9 +153,9 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) 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); @@ -206,12 +206,20 @@ void TimeLabels::updateConfig() // 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 diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp index d675517..6cb1f31 100644 --- a/microkde/KDGanttMinimizeSplitter.cpp +++ b/microkde/KDGanttMinimizeSplitter.cpp @@ -677,17 +677,18 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) #else if ( !mRubberBand ) { mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop); mRubberBand->setFrameStyle( Box | Raised ); - mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) ); + //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) ); + mRubberBand->setPalette( QPalette ( QColor( 178,18,188), QColor( 242,27,255 ) )); } QRect r = contentsRect(); static int rBord = 0; //Themable???? if ( !rBord ) { if (QApplication::desktop()->width() <= 320 ) - rBord = 4; + rBord = 3; else - rBord = 5; + rBord = 4; } int sw = style().splitterWidth(); if ( orient == Horizontal ) { if ( p >= 0 ) { |