| -rw-r--r-- | korganizer/calendarview.cpp | 20 | ||||
| -rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 2 |
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 @@ -1881,15 +1881,6 @@ void CalendarView::readSettings() 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 ) { @@ -1905,6 +1896,8 @@ void CalendarView::readSettings() } 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; @@ -1912,15 +1905,6 @@ void CalendarView::readSettings() 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 ) { diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index ab0dd50..18756f0 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -272,5 +272,5 @@ QSize DateNavigatorContainer::minimumSizeHint() const QSize DateNavigatorContainer::sizeHint() const { - return mNavigatorView->sizeHint(); + return mNavigatorView->yourSizeHint(); } |