do not rely on scrollbars beeing right

1 files changed, 4 insertions, 3 deletions

diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index ab7e963..dad1c3f 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -284,67 +284,68 @@ void DateBookWeekView::drawContents( QPainter *p, int cx, int cy, int cw, int ch
 			s = "";
 		    s += QString::number( t - 12 ) + tr("p");
 		} else {
 		    if ( 12 - t < 3 )
 			s = "";
 		    else
 			s = " ";
 		    s += QString::number( t );
 		}
 	    } else {
 		s = QString::number( t );
 		if ( s.length() == 1 )
 		    s.prepend( "0" );
 	    }
 	    p->drawText( 1, y+p->fontMetrics().ascent()+1, s );
 	}
     }
 
     QListIterator<DateBookWeekItem> it(items);
     for ( ; it.current(); ++it ) {
 	DateBookWeekItem *i = it.current();
 	if ( i->geometry().intersects( ur ) ) {
 	    p->setBrush( i->color() );
 	    p->drawRect( i->geometry() );
 	}
     }
 }
 
 void DateBookWeekView::resizeEvent( QResizeEvent *e )
 {
     const int hourWidth = 20;
     QScrollView::resizeEvent( e );
-    int avail = width()-qApp->style().scrollBarExtent().width()-1;
-    header->setGeometry( 0, 0, avail, header->sizeHint().height() );
-    setMargins( 0, header->height(), 0, 0 );
+    int avail = visibleWidth();
+    header->setGeometry( leftMargin()+frameWidth()+frameRect().left() , frameWidth(),
+			  visibleWidth(), header->sizeHint().height() );
+    setMargins( 0, header->sizeHint().height(), 0, 0 );
     header->resizeSection( 0, hourWidth );
     int sw = (avail - hourWidth) / 7;
     for ( int i = 1; i < 7; i++ )
 	header->resizeSection( i, sw );
     header->resizeSection( 7, avail - hourWidth - sw*6 );
 }
 
 void DateBookWeekView::setStartOfWeek( bool bStartOnMonday )
 {
     bOnMonday = bStartOnMonday;
     initNames();
 }
 
 //-------------------------------------------------------------------
 
 DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB,
 			    QWidget *parent, const char *name )
     : QWidget( parent, name ),
       db( newDB ),
       startTime( 0 ),
       ampm( ap ),
       bStartOnMonday( startOnMonday )
 {
 	setFocusPolicy(StrongFocus);
 	QVBoxLayout *vb = new QVBoxLayout( this );
 	header = new DateBookWeekHeader( bStartOnMonday, this );
 	view = new DateBookWeekView( ampm, startOnMonday, this );
 	vb->addWidget( header );
 	vb->addWidget( view );
 
 	lblDesc = new QLabel( this, "event label" );
 	lblDesc->setFrameStyle( QFrame::Plain | QFrame::Box );