summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookweek.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index dad1c3f..8435132 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -310,16 +310,28 @@ void DateBookWeekView::drawContents( QPainter *p, int cx, int cy, int cw, int ch
310} 310}
311 311
312void DateBookWeekView::resizeEvent( QResizeEvent *e ) 312void 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
317#warning check the geometry i have choosen BRANCH_1_0 (waspe)
318
319 //HEAD
320 /*
316 int avail = visibleWidth(); 321 int avail = visibleWidth();
317 header->setGeometry( leftMargin()+frameWidth()+frameRect().left() , frameWidth(), 322 header->setGeometry( leftMargin()+frameWidth()+frameRect().left() , frameWidth(),
318 visibleWidth(), header->sizeHint().height() ); 323 visibleWidth(), header->sizeHint().height() );
319 setMargins( 0, header->sizeHint().height(), 0, 0 ); 324 setMargins( 0, header->sizeHint().height(), 0, 0 );
325 */
326 //BRANCH_1_0
327 int avail = width()-qApp->style().scrollBarExtent().width()-1;
328 header->setGeometry( 0, 0, avail, header->sizeHint().height() );
329 setMargins( 0, header->height(), 0, 0 );
330
331
320 header->resizeSection( 0, hourWidth ); 332 header->resizeSection( 0, hourWidth );
321 int sw = (avail - hourWidth) / 7; 333 int sw = (avail - hourWidth) / 7;
322 for ( int i = 1; i < 7; i++ ) 334 for ( int i = 1; i < 7; i++ )
323 header->resizeSection( i, sw ); 335 header->resizeSection( i, sw );
324 header->resizeSection( 7, avail - hourWidth - sw*6 ); 336 header->resizeSection( 7, avail - hourWidth - sw*6 );
325} 337}
@@ -371,13 +383,13 @@ void DateBookWeek::keyPressEvent(QKeyEvent *e)
371 view->scrollBy(0, -20); 383 view->scrollBy(0, -20);
372 break; 384 break;
373 case Key_Down: 385 case Key_Down:
374 view->scrollBy(0, 20); 386 view->scrollBy(0, 20);
375 break; 387 break;
376 case Key_Left: 388 case Key_Left:
377 setDate(date().addDays(-7)); 389 setDate(date().addDays(-7));
378 break; 390 break;
379 case Key_Right: 391 case Key_Right:
380 setDate(date().addDays(7)); 392 setDate(date().addDays(7));
381 break; 393 break;
382 default: 394 default:
383 e->ignore(); 395 e->ignore();