more layout fixes

2 files changed, 3 insertions, 19 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 8100e25..9a4e719 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1878,21 +1878,12 @@ void CalendarView::readSettings()
         if ( KOPrefs::instance()->mVerticalScreen ) {
             resetval = mDateNavigator->sizeHint().width()+2;
         } else {
             resetval = mDateNavigator->sizeHint().height()+2;
         }
     }
-    if ( !resetval ){// i.e. sizes.count() == 3  
-        if ( KOPrefs::instance()->mVerticalScreen ) {
-            if ( sizes[0] <  mDateNavigator->sizeHint().width()+1 )
-                resetval = mDateNavigator->sizeHint().width()+2;
-        } else {
-            if ( sizes[0] <  mDateNavigator->sizeHint().height()+1 )
-                resetval = mDateNavigator->sizeHint().height()+2;
-        }
-    }
     if ( resetval ) {
         sizes.clear();
         if ( KOPrefs::instance()->mVerticalScreen ) {
             maxVal = QApplication::desktop()->width() -10;
         } else {
             maxVal = QApplication::desktop()->height()-10;
@@ -1902,28 +1893,21 @@ void CalendarView::readSettings()
             resetval = maxVal - resetval;
         sizes << resetval;
         sizes << 100;
     }
     mLeftFrame->setSizes(sizes);
     sizes = config->readIntListEntry("Main Splitter Frame");
+    resetval = 0;
+    maxVal = 0;
     if (sizes.count() != 2) { 
         if ( !KOPrefs::instance()->mVerticalScreen ) {
             resetval = mDateNavigator->sizeHint().width()+2;
         } else {
             resetval = mDateNavigator->sizeHint().height()+2;
         }
     }
-    if ( !resetval ){// i.e. sizes.count() == 3  
-        if ( !KOPrefs::instance()->mVerticalScreen ) {
-            if ( sizes[0] <  mDateNavigator->sizeHint().width()+1 )
-                resetval = mDateNavigator->sizeHint().width()+2;
-        } else {
-            if ( sizes[0] <  mDateNavigator->sizeHint().height()+1 )
-                resetval = mDateNavigator->sizeHint().height()+2;
-        }
-    }
     if ( resetval ) {
         sizes.clear();
         if ( !KOPrefs::instance()->mVerticalScreen ) {
             maxVal = QApplication::desktop()->width() -10;
         } else {
             maxVal = QApplication::desktop()->height()-10;
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index ab0dd50..18756f0 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -269,8 +269,8 @@ QSize DateNavigatorContainer::minimumSizeHint() const
 {
   return mNavigatorView->minimumSizeHint();
 }
 
 QSize DateNavigatorContainer::sizeHint() const
 {
-  return mNavigatorView->sizeHint();
+    return mNavigatorView->yourSizeHint();
 }