diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /qte/qte-2.3.8-snapshot/lefthand.patch | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'qte/qte-2.3.8-snapshot/lefthand.patch')
-rw-r--r-- | qte/qte-2.3.8-snapshot/lefthand.patch | 126 |
1 files changed, 0 insertions, 126 deletions
diff --git a/qte/qte-2.3.8-snapshot/lefthand.patch b/qte/qte-2.3.8-snapshot/lefthand.patch deleted file mode 100644 index 0a0cccf210..0000000000 --- a/qte/qte-2.3.8-snapshot/lefthand.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -u qt-2.3.7_orig/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollview.cpp ---- qt-2.3.7_orig/src/widgets/qscrollview.cpp 2004-06-13 20:42:54.000000000 +0200 -+++ qt-2.3.7/src/widgets/qscrollview.cpp 2004-06-13 20:45:16.000000000 +0200 -@@ -526,15 +526,16 @@ - 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 ) ); -+ - } - - -@@ -683,6 +684,11 @@ - 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 -@@ -786,45 +792,50 @@ - - // 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, h-hsbExt-fw, -+ setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw, - right-fw-fw, hsbExt ); - else -- setHBarGeometry(d->hbar, 0, h-hsbExt, right, -+ setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right, - hsbExt ); - bottom=h-hsbExt; - } else { - bottom=h; - } - if ( showv ) { -- clipper()->setGeometry( lmarg, tmarg, -+ clipper()->setGeometry( lmarg + xoffset, tmarg, - w-vsbExt-lmarg-rmarg, - bottom-tmarg-bmarg ); - d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg ); - if ( style() == WindowsStyle ) -- changeFrameRect(QRect(0, 0, w, h) ); -+ changeFrameRect(QRect(xoffset, 0, w, h) ); - else -- changeFrameRect(QRect(0, 0, w-vsbExt, bottom)); -+ changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom)); - if (cornerWidget()) { - if ( style() == WindowsStyle ) -- setVBarGeometry( d->vbar, w-vsbExt-fw, -- fw, vsbExt, -- h-hsbExt-fw-fw ); -+ setVBarGeometry( d->vbar, xpos, -+ ypos, vsbExt, -+ bottom-fw-ypos ); - else -- setVBarGeometry( d->vbar, w-vsbExt, 0, -+ setVBarGeometry( d->vbar, xpos, ypos, - vsbExt, -- h-hsbExt ); -+ bottom-ypos ); - } - else { - if ( style() == WindowsStyle ) -- setVBarGeometry( d->vbar, w-vsbExt-fw, -- fw, vsbExt, -- bottom-fw-fw ); -+ setVBarGeometry( d->vbar, xpos, -+ ypos, vsbExt, -+ bottom-fw-ypos ); - else -- setVBarGeometry( d->vbar, w-vsbExt, 0, -- vsbExt, bottom ); -+ setVBarGeometry( d->vbar, xpos, ypos, -+ vsbExt, bottom-ypos ); - } - } else { - if ( style() == WindowsStyle ) -@@ -837,12 +848,12 @@ - } - if ( d->corner ) { - if ( style() == WindowsStyle ) -- d->corner->setGeometry( w-vsbExt-fw, -+ d->corner->setGeometry( xpos, - h-hsbExt-fw, - vsbExt, - hsbExt ); - else -- d->corner->setGeometry( w-vsbExt, -+ d->corner->setGeometry( xpos, - h-hsbExt, - vsbExt, - hsbExt ); -@@ -1675,7 +1686,7 @@ - } - - /*! -- Scrolls the content by \a x to the left and \a y upwards. -+ Scrolls the content by \a dx to the left and \a dy upwards. - */ - void QScrollView::scrollBy( int dx, int dy ) - { |