author | waspe <waspe> | 2003-11-03 18:29:32 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:29:32 (UTC) |
commit | 3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c (patch) (unidiff) | |
tree | 96119aac19a49850a221d34f3152fa12b0a86a46 | |
parent | 87a9d6badcf518ffd14559ef886ff7729b63b73b (diff) | |
download | opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.zip opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.tar.gz opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.tar.bz2 |
remove merge conflict
-rw-r--r-- | core/pim/datebook/datebookweek.cpp | 14 |
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 | |||
@@ -315,2 +315,7 @@ void DateBookWeekView::resizeEvent( QResizeEvent *e ) | |||
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(); |
@@ -319,2 +324,9 @@ void DateBookWeekView::resizeEvent( QResizeEvent *e ) | |||
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 ); |
@@ -376,3 +388,3 @@ void DateBookWeek::keyPressEvent(QKeyEvent *e) | |||
376 | case Key_Left: | 388 | case Key_Left: |
377 | setDate(date().addDays(-7)); | 389 | setDate(date().addDays(-7)); |
378 | break; | 390 | break; |