remove merge conflict

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 )
     QScrollView::resizeEvent( e );
+
+#warning check the geometry i have choosen BRANCH_1_0 (waspe)
+
+    //HEAD
+    /*
     int avail = visibleWidth();
@@ -319,2 +324,9 @@ void DateBookWeekView::resizeEvent( QResizeEvent *e )
     setMargins( 0, header->sizeHint().height(), 0, 0 );
+    */
+    //BRANCH_1_0
+    int avail = width()-qApp->style().scrollBarExtent().width()-1;
+    header->setGeometry( 0, 0, avail, header->sizeHint().height() );
+    setMargins( 0, header->height(), 0, 0 );
+
+
     header->resizeSection( 0, hourWidth );
@@ -376,3 +388,3 @@ void DateBookWeek::keyPressEvent(QKeyEvent *e)
         case Key_Left:
-            setDate(date().addDays(-7));
+               setDate(date().addDays(-7));
             break;