-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 | |||
@@ -155,5 +155,5 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) | |||
155 | int sHei = fmS.ascent() ; | 155 | int sHei = fmS.ascent() ; |
156 | //sHei -= (sHei/4-2); | 156 | //sHei -= (sHei/4-2); |
157 | int startW = this->width() - 2*frameWidth()-1; | 157 | int startW = this->width() - frameWidth()-2; |
158 | int tw2 = fmS.width(suffix); | 158 | int tw2 = fmS.width(suffix); |
159 | while (y < cy + ch) { | 159 | while (y < cy + ch) { |
@@ -208,8 +208,16 @@ void TimeLabels::updateConfig() | |||
208 | // QFont font = config->readFontEntry("TimeBar Font"); | 208 | // QFont font = config->readFontEntry("TimeBar Font"); |
209 | setFont(KOPrefs::instance()->mTimeBarFont); | 209 | setFont(KOPrefs::instance()->mTimeBarFont); |
210 | QString test = "20oo"; | 210 | QString test = "20"; |
211 | if (KGlobal::locale()->use12Clock()) | 211 | if (KGlobal::locale()->use12Clock()) |
212 | test = "12mi"; | 212 | test = "12"; |
213 | mMiniWidth = fontMetrics().width(test) + frameWidth()*2 +1 ; | 213 | mMiniWidth = fontMetrics().width(test); |
214 | if (KGlobal::locale()->use12Clock()) | ||
215 | test = "pm"; | ||
216 | else | ||
217 | test = "00"; | ||
218 | QFont sFont = font(); | ||
219 | sFont.setPointSize( sFont.pointSize()/2 ); | ||
220 | QFontMetrics fmS( sFont ); | ||
221 | mMiniWidth += fmS.width( test ) + frameWidth()*2 +4 ; | ||
214 | // update geometry restrictions based on new settings | 222 | // update geometry restrictions based on new settings |
215 | setFixedWidth( mMiniWidth ); | 223 | setFixedWidth( mMiniWidth ); |
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp index d675517..6cb1f31 100644 --- a/microkde/KDGanttMinimizeSplitter.cpp +++ b/microkde/KDGanttMinimizeSplitter.cpp | |||
@@ -679,5 +679,6 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) | |||
679 | mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop); | 679 | mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop); |
680 | mRubberBand->setFrameStyle( Box | Raised ); | 680 | mRubberBand->setFrameStyle( Box | Raised ); |
681 | mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) ); | 681 | //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) ); |
682 | mRubberBand->setPalette( QPalette ( QColor( 178,18,188), QColor( 242,27,255 ) )); | ||
682 | } | 683 | } |
683 | QRect r = contentsRect(); | 684 | QRect r = contentsRect(); |
@@ -685,7 +686,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) | |||
685 | if ( !rBord ) { | 686 | if ( !rBord ) { |
686 | if (QApplication::desktop()->width() <= 320 ) | 687 | if (QApplication::desktop()->width() <= 320 ) |
687 | rBord = 4; | 688 | rBord = 3; |
688 | else | 689 | else |
689 | rBord = 5; | 690 | rBord = 4; |
690 | } | 691 | } |
691 | int sw = style().splitterWidth(); | 692 | int sw = style().splitterWidth(); |