author | umopapisdn <umopapisdn> | 2003-03-28 12:06:00 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2003-03-28 12:06:00 (UTC) |
commit | 8e8803488d2c11b12449e785802da4a5a9adad0f (patch) (unidiff) | |
tree | 2c7b5ae7e1d6151a3ee89e755f5afb649c1c653c /core | |
parent | 6cee1b34ffc7b3b8a0c8e1831fff0cc1af0e708a (diff) | |
download | opie-8e8803488d2c11b12449e785802da4a5a9adad0f.zip opie-8e8803488d2c11b12449e785802da4a5a9adad0f.tar.gz opie-8e8803488d2c11b12449e785802da4a5a9adad0f.tar.bz2 |
Minimum size in weekview should be dependant on the height of the window.
-rw-r--r-- | core/pim/datebook/datebookweek.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp index 874cf24..8241655 100644 --- a/core/pim/datebook/datebookweek.cpp +++ b/core/pim/datebook/datebookweek.cpp | |||
@@ -191,26 +191,24 @@ void DateBookWeekView::positionItem( DateBookWeekItem *i ) | |||
191 | 191 | ||
192 | // 30 minute intervals | 192 | // 30 minute intervals |
193 | int y = ev.start().hour() * 2; | 193 | int y = ev.start().hour() * 2; |
194 | y += db_round30min( ev.start().minute() ); | 194 | y += db_round30min( ev.start().minute() ); |
195 | int y2 = ev.end().hour() * 2; | 195 | int y2 = ev.end().hour() * 2; |
196 | y2 += db_round30min( ev.end().minute() ); | 196 | y2 += db_round30min( ev.end().minute() ); |
197 | if ( y > 47 ) | 197 | if ( y > 47 ) y = 47; |
198 | y = 47; | 198 | if ( y2 > 48 ) y2 = 48; |
199 | if ( y2 > 48 ) | 199 | y = (y * rowHeight) / 2; |
200 | y2 = 48; | 200 | y2 = (y2 * rowHeight) / 2; |
201 | y = y * rowHeight / 2; | ||
202 | y2 = y2 * rowHeight / 2; | ||
203 | 201 | ||
204 | int h; | 202 | int h; |
205 | if ( ev.event().type() == Event::AllDay ) { | 203 | if ( ev.event().type() == Event::AllDay ) { |
206 | h = 48 * rowHeight / 2; | 204 | h = (48 * rowHeight) / 2; |
207 | y = 0; | 205 | y = 0; |
208 | } else { | 206 | } else { |
209 | h=y2-y; | 207 | h=y2-y; |
210 | if ( h < 1 ) h = 1; | 208 | if ( h < (1*rowHeight)/2 ) h = (1*rowHeight)/2; |
211 | } | 209 | } |
212 | 210 | ||
213 | int dow = ev.date().dayOfWeek(); | 211 | int dow = ev.date().dayOfWeek(); |
214 | if ( !bOnMonday ) { | 212 | if ( !bOnMonday ) { |
215 | if ( dow == 7 ) | 213 | if ( dow == 7 ) |
216 | dow = 1; | 214 | dow = 1; |