-rw-r--r-- | korganizer/komonthview.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 6294b98..0ef5ae4 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -1150,29 +1150,30 @@ void KOMonthView::computeLayoutWeek() | |||
1150 | int i; | 1150 | int i; |
1151 | int x,y,w,h; | 1151 | int x,y,w,h; |
1152 | x= 0; | 1152 | x= 0; |
1153 | y= 0; | 1153 | y= 0; |
1154 | w = colWid; | 1154 | w = colWid; |
1155 | h = dayLabelHei ; | 1155 | h = dayLabelHei ; |
1156 | for ( i = 0; i < 7; i++) { | 1156 | for ( i = 0; i < 7; i++) { |
1157 | if ( i && !( i % daysToShow) && i < 6) { | 1157 | if ( i && !( i % daysToShow) && i < 6) { |
1158 | y += hei/(5-daysToShow); | 1158 | y += hei/(5-daysToShow); |
1159 | x = 0; | 1159 | x = 0; |
1160 | w = colWid; | 1160 | w = colWid; |
1161 | } | 1161 | } |
1162 | if ( i == daysToShow-colModulo ) | 1162 | if ( ((i) % daysToShow) >= daysToShow-colModulo ) { |
1163 | ++w; | 1163 | ++w; |
1164 | } | ||
1164 | if ( i >= 5 ) { | 1165 | if ( i >= 5 ) { |
1165 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+1,h); | 1166 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h); |
1166 | x -= w/2 ; | 1167 | x -= (w/2 ); |
1167 | } | 1168 | } |
1168 | else | 1169 | else |
1169 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h); | 1170 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h); |
1170 | x += w; | 1171 | x += w; |
1171 | } | 1172 | } |
1172 | x= 0; | 1173 | x= 0; |
1173 | y= dayLabelHei; | 1174 | y= dayLabelHei; |
1174 | w = colWid; | 1175 | w = colWid; |
1175 | h = cellHei; | 1176 | h = cellHei; |
1176 | for ( i = 0; i < mCells.count(); ++i) { | 1177 | for ( i = 0; i < mCells.count(); ++i) { |
1177 | if ( i > 6 ) { | 1178 | if ( i > 6 ) { |
1178 | mCells[i]->hide(); | 1179 | mCells[i]->hide(); |
@@ -1182,24 +1183,27 @@ void KOMonthView::computeLayoutWeek() | |||
1182 | w = colWid; | 1183 | w = colWid; |
1183 | if ( ((i) % daysToShow) >= daysToShow-colModulo ) { | 1184 | if ( ((i) % daysToShow) >= daysToShow-colModulo ) { |
1184 | ++w; | 1185 | ++w; |
1185 | } | 1186 | } |
1186 | if ( i == (daysToShow-1-rowModulo)*7) | 1187 | if ( i == (daysToShow-1-rowModulo)*7) |
1187 | ++h; | 1188 | ++h; |
1188 | 1189 | ||
1189 | if ( i >= 5 ) { | 1190 | if ( i >= 5 ) { |
1190 | if ( i ==5 ) { | 1191 | if ( i ==5 ) { |
1191 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); | 1192 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); |
1192 | x -= w ;y += h/2; | 1193 | x -= w ;y += h/2; |
1193 | } else { | 1194 | } else { |
1195 | if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) { | ||
1196 | ++w; | ||
1197 | } | ||
1194 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); | 1198 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); |
1195 | y -= h/2; | 1199 | y -= h/2; |
1196 | } | 1200 | } |
1197 | } else | 1201 | } else |
1198 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); | 1202 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); |
1199 | 1203 | ||
1200 | 1204 | ||
1201 | x += w; | 1205 | x += w; |
1202 | if ( x + w/2 > wid ) { | 1206 | if ( x + w/2 > wid ) { |
1203 | x = 0; | 1207 | x = 0; |
1204 | y += h+dayLabelHei ; | 1208 | y += h+dayLabelHei ; |
1205 | } | 1209 | } |