author | zautrix <zautrix> | 2005-02-01 23:46:24 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-01 23:46:24 (UTC) |
commit | 9ecfd0660e36b6b8dd7401f0edb16dd3d6f03289 (patch) (unidiff) | |
tree | d80eb20b97ab401b4e9e34f25b65030fb2c0b035 /korganizer | |
parent | afa94abe147d23e09a14a81e47d04d4a3d5670c3 (diff) | |
download | kdepimpi-9ecfd0660e36b6b8dd7401f0edb16dd3d6f03289.zip kdepimpi-9ecfd0660e36b6b8dd7401f0edb16dd3d6f03289.tar.gz kdepimpi-9ecfd0660e36b6b8dd7401f0edb16dd3d6f03289.tar.bz2 |
text
-rw-r--r-- | korganizer/komonthview.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 9888566..6294b98 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -687,17 +687,13 @@ void MonthViewCell::select() | |||
687 | } | 687 | } |
688 | 688 | ||
689 | void MonthViewCell::resizeEvent ( QResizeEvent * ) | 689 | void MonthViewCell::resizeEvent ( QResizeEvent * ) |
690 | { | 690 | { |
691 | if ( !mMonthView->isUpdatePossible() ) | 691 | if ( !mMonthView->isUpdatePossible() ) |
692 | return; | 692 | return; |
693 | #ifndef DESKTOP_VERSION | 693 | |
694 | if ( !isVisible() ){ | ||
695 | return; | ||
696 | } | ||
697 | #endif | ||
698 | int size = height() - mLabel->height() - 2; | 694 | int size = height() - mLabel->height() - 2; |
699 | if ( size > 0 ) | 695 | if ( size > 0 ) |
700 | mItemList->verticalScrollBar()->setMaximumHeight( size ); | 696 | mItemList->verticalScrollBar()->setMaximumHeight( size ); |
701 | size = width() - mLabel->width() -2; | 697 | size = width() - mLabel->width() -2; |
702 | if ( size > 0 ) | 698 | if ( size > 0 ) |
703 | mItemList->horizontalScrollBar()->setMaximumWidth( size ); | 699 | mItemList->horizontalScrollBar()->setMaximumWidth( size ); |
@@ -838,12 +834,14 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | |||
838 | KOMonthView::~KOMonthView() | 834 | KOMonthView::~KOMonthView() |
839 | { | 835 | { |
840 | delete mContextMenu; | 836 | delete mContextMenu; |
841 | } | 837 | } |
842 | void KOMonthView::switchView() | 838 | void KOMonthView::switchView() |
843 | { | 839 | { |
840 | if ( selectedCell( ) ) | ||
841 | selectedCell()->deselect(); | ||
844 | mShowWeekView = !mShowWeekView; | 842 | mShowWeekView = !mShowWeekView; |
845 | KOPrefs::instance()->mMonthViewWeek = mShowWeekView; | 843 | KOPrefs::instance()->mMonthViewWeek = mShowWeekView; |
846 | emit showNavigator( !mShowWeekView ); | 844 | emit showNavigator( !mShowWeekView ); |
847 | computeLayout(); | 845 | computeLayout(); |
848 | updateConfig(); | 846 | updateConfig(); |
849 | } | 847 | } |
@@ -1156,17 +1154,18 @@ void KOMonthView::computeLayoutWeek() | |||
1156 | w = colWid; | 1154 | w = colWid; |
1157 | h = dayLabelHei ; | 1155 | h = dayLabelHei ; |
1158 | for ( i = 0; i < 7; i++) { | 1156 | for ( i = 0; i < 7; i++) { |
1159 | if ( i && !( i % daysToShow) && i < 6) { | 1157 | if ( i && !( i % daysToShow) && i < 6) { |
1160 | y += hei/(5-daysToShow); | 1158 | y += hei/(5-daysToShow); |
1161 | x = 0; | 1159 | x = 0; |
1160 | w = colWid; | ||
1162 | } | 1161 | } |
1163 | if ( i == daysToShow-colModulo ) | 1162 | if ( i == daysToShow-colModulo ) |
1164 | ++w; | 1163 | ++w; |
1165 | if ( i >= 5 ) { | 1164 | if ( i >= 5 ) { |
1166 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h); | 1165 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+1,h); |
1167 | x -= w/2 ; | 1166 | x -= w/2 ; |
1168 | } | 1167 | } |
1169 | else | 1168 | else |
1170 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h); | 1169 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h); |
1171 | x += w; | 1170 | x += w; |
1172 | } | 1171 | } |