summaryrefslogtreecommitdiff
authorzecke <zecke>2004-06-13 18:53:09 (UTC)
committer zecke <zecke>2004-06-13 18:53:09 (UTC)
commit139a1f3273e8691b39029e8fbc455ec97a700018 (patch) (side-by-side diff)
tree2bd85819528e39fe13f7f2c12504941bcad80aad
parentecf1fb42bef9d64869349abd4e550f0b6d2cfa59 (diff)
downloadopie-139a1f3273e8691b39029e8fbc455ec97a700018.zip
opie-139a1f3273e8691b39029e8fbc455ec97a700018.tar.gz
opie-139a1f3273e8691b39029e8fbc455ec97a700018.tar.bz2
Rediffed version of the lefthand patch
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-lefthand.patch126
1 files changed, 126 insertions, 0 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-lefthand.patch b/qt/qt-2.3.7.patch/qte237-lefthand.patch
new file mode 100644
index 0000000..1cddd29
--- a/dev/null
+++ b/qt/qt-2.3.7.patch/qte237-lefthand.patch
@@ -0,0 +1,126 @@
+diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollview.cpp
+--- qt-2.3.7/src/widgets/qscrollview.cpp 2004-06-13 20:45:16.000000000 +0200
++++ qt-2.3.7_orig/src/widgets/qscrollview.cpp 2004-06-13 20:42:54.000000000 +0200
+@@ -526,16 +526,15 @@
+ this, SLOT( doDragAutoScroll() ) );
+ #endif
+
+- connect( &d->hbar, SIGNAL( valueChanged(int) ),
+- this, SLOT( hslide(int) ) );
+- connect( &d->vbar, SIGNAL( valueChanged(int) ),
+- this, SLOT( vslide(int) ) );
++ connect( &d->hbar, SIGNAL( valueChanged( int ) ),
++ this, SLOT( hslide( int ) ) );
++ connect( &d->vbar, SIGNAL( valueChanged( int ) ),
++ this, SLOT( vslide( int ) ) );
+ d->viewport.installEventFilter( this );
+
+ setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
+ setLineWidth( style().defaultFrameWidth() );
+ setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+-
+ }
+
+
+@@ -684,11 +683,6 @@
+ h-tmarg-bmarg - (showh ? hsbExt : 0) );
+ }
+
+-/*
+- The surrounding environment (or application, if there is no
+- environment, may set this. Requires Qt >= 2.3.8.
+-*/
+-bool qt_left_hand_scrollbars = FALSE;
+
+ /*!
+ Updates scrollbars - all possibilities considered. You should never
+@@ -792,50 +786,45 @@
+
+ // Position the scrollbars, viewport, and corner widget.
+ int bottom;
+- int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0;
+- int xpos = qt_left_hand_scrollbars ? 0 : w-vsbExt;
+- xpos = (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw;
+- int ypos = tmarg;
+- ypos = (style() == WindowsStyle) ? ypos +fw : 0;
+ if ( showh ) {
+ int right = ( showv || cornerWidget() ) ? w-vsbExt : w;
+ if ( style() == WindowsStyle )
+- setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw,
++ setHBarGeometry(d->hbar, fw, h-hsbExt-fw,
+ right-fw-fw, hsbExt );
+ else
+- setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right,
++ setHBarGeometry(d->hbar, 0, h-hsbExt, right,
+ hsbExt );
+ bottom=h-hsbExt;
+ } else {
+ bottom=h;
+ }
+ if ( showv ) {
+- clipper()->setGeometry( lmarg + xoffset, tmarg,
++ clipper()->setGeometry( lmarg, tmarg,
+ w-vsbExt-lmarg-rmarg,
+ bottom-tmarg-bmarg );
+ d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg );
+ if ( style() == WindowsStyle )
+- changeFrameRect(QRect(xoffset, 0, w, h) );
++ changeFrameRect(QRect(0, 0, w, h) );
+ else
+- changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom));
++ changeFrameRect(QRect(0, 0, w-vsbExt, bottom));
+ if (cornerWidget()) {
+ if ( style() == WindowsStyle )
+- setVBarGeometry( d->vbar, xpos,
+- ypos, vsbExt,
+- bottom-fw-ypos );
++ setVBarGeometry( d->vbar, w-vsbExt-fw,
++ fw, vsbExt,
++ h-hsbExt-fw-fw );
+ else
+- setVBarGeometry( d->vbar, xpos, ypos,
++ setVBarGeometry( d->vbar, w-vsbExt, 0,
+ vsbExt,
+- bottom-ypos );
++ h-hsbExt );
+ }
+ else {
+ if ( style() == WindowsStyle )
+- setVBarGeometry( d->vbar, xpos,
+- ypos, vsbExt,
+- bottom-fw-ypos );
++ setVBarGeometry( d->vbar, w-vsbExt-fw,
++ fw, vsbExt,
++ bottom-fw-fw );
+ else
+- setVBarGeometry( d->vbar, xpos, ypos,
+- vsbExt, bottom-ypos );
++ setVBarGeometry( d->vbar, w-vsbExt, 0,
++ vsbExt, bottom );
+ }
+ } else {
+ if ( style() == WindowsStyle )
+@@ -848,12 +837,12 @@
+ }
+ if ( d->corner ) {
+ if ( style() == WindowsStyle )
+- d->corner->setGeometry( xpos,
++ d->corner->setGeometry( w-vsbExt-fw,
+ h-hsbExt-fw,
+ vsbExt,
+ hsbExt );
+ else
+- d->corner->setGeometry( xpos,
++ d->corner->setGeometry( w-vsbExt,
+ h-hsbExt,
+ vsbExt,
+ hsbExt );
+@@ -1686,7 +1675,7 @@
+ }
+
+ /*!
+- Scrolls the content by \a dx to the left and \a dy upwards.
++ Scrolls the content by \a x to the left and \a y upwards.
+ */
+ void QScrollView::scrollBy( int dx, int dy )
+ {