-rw-r--r-- | core/pim/datebook/datebookweek.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp index ab7e963..dad1c3f 100644 --- a/core/pim/datebook/datebookweek.cpp +++ b/core/pim/datebook/datebookweek.cpp | |||
@@ -292,51 +292,52 @@ void DateBookWeekView::drawContents( QPainter *p, int cx, int cy, int cw, int ch | |||
292 | } | 292 | } |
293 | } else { | 293 | } else { |
294 | s = QString::number( t ); | 294 | s = QString::number( t ); |
295 | if ( s.length() == 1 ) | 295 | if ( s.length() == 1 ) |
296 | s.prepend( "0" ); | 296 | s.prepend( "0" ); |
297 | } | 297 | } |
298 | p->drawText( 1, y+p->fontMetrics().ascent()+1, s ); | 298 | p->drawText( 1, y+p->fontMetrics().ascent()+1, s ); |
299 | } | 299 | } |
300 | } | 300 | } |
301 | 301 | ||
302 | QListIterator<DateBookWeekItem> it(items); | 302 | QListIterator<DateBookWeekItem> it(items); |
303 | for ( ; it.current(); ++it ) { | 303 | for ( ; it.current(); ++it ) { |
304 | DateBookWeekItem *i = it.current(); | 304 | DateBookWeekItem *i = it.current(); |
305 | if ( i->geometry().intersects( ur ) ) { | 305 | if ( i->geometry().intersects( ur ) ) { |
306 | p->setBrush( i->color() ); | 306 | p->setBrush( i->color() ); |
307 | p->drawRect( i->geometry() ); | 307 | p->drawRect( i->geometry() ); |
308 | } | 308 | } |
309 | } | 309 | } |
310 | } | 310 | } |
311 | 311 | ||
312 | void DateBookWeekView::resizeEvent( QResizeEvent *e ) | 312 | void DateBookWeekView::resizeEvent( QResizeEvent *e ) |
313 | { | 313 | { |
314 | const int hourWidth = 20; | 314 | const int hourWidth = 20; |
315 | QScrollView::resizeEvent( e ); | 315 | QScrollView::resizeEvent( e ); |
316 | int avail = width()-qApp->style().scrollBarExtent().width()-1; | 316 | int avail = visibleWidth(); |
317 | header->setGeometry( 0, 0, avail, header->sizeHint().height() ); | 317 | header->setGeometry( leftMargin()+frameWidth()+frameRect().left() , frameWidth(), |
318 | setMargins( 0, header->height(), 0, 0 ); | 318 | visibleWidth(), header->sizeHint().height() ); |
319 | setMargins( 0, header->sizeHint().height(), 0, 0 ); | ||
319 | header->resizeSection( 0, hourWidth ); | 320 | header->resizeSection( 0, hourWidth ); |
320 | int sw = (avail - hourWidth) / 7; | 321 | int sw = (avail - hourWidth) / 7; |
321 | for ( int i = 1; i < 7; i++ ) | 322 | for ( int i = 1; i < 7; i++ ) |
322 | header->resizeSection( i, sw ); | 323 | header->resizeSection( i, sw ); |
323 | header->resizeSection( 7, avail - hourWidth - sw*6 ); | 324 | header->resizeSection( 7, avail - hourWidth - sw*6 ); |
324 | } | 325 | } |
325 | 326 | ||
326 | void DateBookWeekView::setStartOfWeek( bool bStartOnMonday ) | 327 | void DateBookWeekView::setStartOfWeek( bool bStartOnMonday ) |
327 | { | 328 | { |
328 | bOnMonday = bStartOnMonday; | 329 | bOnMonday = bStartOnMonday; |
329 | initNames(); | 330 | initNames(); |
330 | } | 331 | } |
331 | 332 | ||
332 | //------------------------------------------------------------------- | 333 | //------------------------------------------------------------------- |
333 | 334 | ||
334 | DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB, | 335 | DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB, |
335 | QWidget *parent, const char *name ) | 336 | QWidget *parent, const char *name ) |
336 | : QWidget( parent, name ), | 337 | : QWidget( parent, name ), |
337 | db( newDB ), | 338 | db( newDB ), |
338 | startTime( 0 ), | 339 | startTime( 0 ), |
339 | ampm( ap ), | 340 | ampm( ap ), |
340 | bStartOnMonday( startOnMonday ) | 341 | bStartOnMonday( startOnMonday ) |
341 | { | 342 | { |
342 | setFocusPolicy(StrongFocus); | 343 | setFocusPolicy(StrongFocus); |