| author | umopapisdn <umopapisdn> | 2003-04-12 00:29:05 (UTC) |
|---|---|---|
| committer | umopapisdn <umopapisdn> | 2003-04-12 00:29:05 (UTC) |
| commit | 79fcbf52d267aa3eb839de35f15992bf5e18f8eb (patch) (side-by-side diff) | |
| tree | 5e3e1432654d3c97849356e96a1fc4c538a71118 | |
| parent | 59e2de381eebb33238ee1b257736a9ae0afdbb7e (diff) | |
| download | opie-79fcbf52d267aa3eb839de35f15992bf5e18f8eb.zip opie-79fcbf52d267aa3eb839de35f15992bf5e18f8eb.tar.gz opie-79fcbf52d267aa3eb839de35f15992bf5e18f8eb.tar.bz2 | |
Bugfix: (bug #0000811) Events are now always atleast 12 pixels high in dayview.
| -rw-r--r-- | core/pim/datebook/datebookday.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp index af98e06..db4c2fd 100644 --- a/core/pim/datebook/datebookday.cpp +++ b/core/pim/datebook/datebookday.cpp @@ -621,9 +621,9 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, int rh = dateBook->dayView()->rowHeight(0); y = y*rh/60; h = h*rh/60; - if ( h < 3 ) { - h = 3; - } + + if ( h < 12 ) h = 12; // Make sure the widget is no smaller than 12 pixels high, so that it's possible to read atleast the first line. + if ( y > ((24*rh)-12) ) y=(24*rh)-12; // Make sure the widget fits inside the dayview. geom.setY( y ); geom.setHeight( h ); geom.setX( 0 ); @@ -631,7 +631,7 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, } void DateBookDayWidget::setAllDayText( QString &text ) { - text += "<b>" + tr("This is an all day event.") + "</b><br>"; + text += "<b>" + tr("This is an all day event.") + "</b>"; } void DateBookDayWidget::setEventText( QString& text ) { bool whichClock = dateBook->dayView()->whichClock(); @@ -641,7 +641,7 @@ void DateBookDayWidget::setEventText( QString& text ) { text += " - " + TimeString::longDateString( ev.startDate() ) + "<br>"; text += "<b>" + tr("End") + "</b>: "; text += TimeString::timeString( ev.event().end().time(), whichClock, FALSE ); - text += " - " + TimeString::longDateString( ev.endDate() ) + "<br>"; + text += " - " + TimeString::longDateString( ev.endDate() ); } else { text += "<b>" + tr("Time") + "</b>: "; text += TimeString::timeString( ev.start(), whichClock, FALSE ); |