summaryrefslogtreecommitdiff
authorzecke <zecke>2004-06-13 18:54:52 (UTC)
committer zecke <zecke>2004-06-13 18:54:52 (UTC)
commitf74ad6f0e20cb803321cec629cd8d37abc966571 (patch) (side-by-side diff)
treea29a11e41f53d4ea763d68b4dd77082796e43e28
parent139a1f3273e8691b39029e8fbc455ec97a700018 (diff)
downloadopie-f74ad6f0e20cb803321cec629cd8d37abc966571.zip
opie-f74ad6f0e20cb803321cec629cd8d37abc966571.tar.gz
opie-f74ad6f0e20cb803321cec629cd8d37abc966571.tar.bz2
Lefthand Patch rediffed and applies now to QtE 2.3.7
It is the one from Qt2.3.8
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--qt/left-handed-qt236.patch169
-rw-r--r--qt/qt-2.3.7.patch/qte237-lefthand.patch110
2 files changed, 55 insertions, 224 deletions
diff --git a/qt/left-handed-qt236.patch b/qt/left-handed-qt236.patch
deleted file mode 100644
index 45353c7..0000000
--- a/qt/left-handed-qt236.patch
+++ b/dev/null
@@ -1,169 +0,0 @@
-Index: table/qtable.cpp
-===================================================================
-RCS file: /home/ich/cvs/TT/qt/src/table/qtable.cpp,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 qtable.cpp
---- table/qtable.cpp 17 Aug 2003 14:22:32 -0000 1.1.1.1
-+++ table/qtable.cpp 29 Aug 2003 13:59:56 -0000
-@@ -500,7 +500,7 @@
-
- if ( rw == -1 || cl == -1 )
- return;
--
-+
- int rrow = rw;
- int rcol = cl;
- if ( rowspan > 1 || colspan > 1 ) {
-@@ -1190,7 +1190,7 @@
-
- if ( rowh == 0 )
- continue;
--
-+
- // Go through the columns in row r
- // if we know from where to where, go through [colfirst, collast],
- // else go through all of them
-@@ -1204,7 +1204,7 @@
-
- if ( colw == 0 )
- continue;
--
-+
- QTableItem *itm = item( r, c );
- if ( itm &&
- ( itm->colSpan() > 1 || itm->rowSpan() > 1 ) ) {
-@@ -2345,6 +2345,7 @@
- {
- if ( inUpdateGeometries )
- return;
-+
- inUpdateGeometries = TRUE;
- QSize ts = tableSize();
- if ( topHeader->offset() &&
-@@ -2354,9 +2355,13 @@
- ts.height() < leftHeader->offset() + leftHeader->height() )
- verticalScrollBar()->setValue( ts.height() - leftHeader->height() );
-
-- leftHeader->setGeometry( frameWidth(), topMargin() + frameWidth(),
-+ /*
-+ * for the scrollbar on the left side simply using framewidth is
-+ * not enough cause this would overdraw the scrollbar
-+ */
-+ leftHeader->setGeometry( frameWidth()+ frameRect().left(), topMargin() + frameWidth(),
- leftMargin(), visibleHeight() );
-- topHeader->setGeometry( leftMargin() + frameWidth(), frameWidth(),
-+ topHeader->setGeometry( leftMargin() + frameWidth() + frameRect().left(), frameWidth(),
- visibleWidth(), topMargin() );
- inUpdateGeometries = FALSE;
- }
-Index: widgets/qscrollview.cpp
-===================================================================
-RCS file: /home/ich/cvs/TT/qt/src/widgets/qscrollview.cpp,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 qscrollview.cpp
---- widgets/qscrollview.cpp 17 Aug 2003 14:24:04 -0000 1.1.1.2
-+++ widgets/qscrollview.cpp 29 Aug 2003 14:03:13 -0000
-@@ -786,45 +786,56 @@
-
- // Position the scrollbars, viewport, and corner widget.
- int bottom;
-+#ifdef QT_FOR_LEFT_HAND
-+ static bool left = true;
-+#else
-+ static bool left = false;
-+#endif
-+ int xoffset = ( left && ( showv || cornerWidget() ) ) ? vsbExt : 0;
-+ int xpos = left ? 0 : w-vsbExt;
-+ xpos = (style() == WindowsStyle) && left ? 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) );
-- else
-- changeFrameRect(QRect(0, 0, w-vsbExt, bottom));
-+ if ( style() == WindowsStyle ) {
-+ changeFrameRect(QRect(xoffset, 0, w, h) );
-+ }else{
-+ 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 );
-@@ -2058,12 +2069,12 @@
- void QScrollView::changeFrameRect(const QRect& r)
- {
- QRect oldr = frameRect();
-- if (oldr != r) {
-+ if (oldr != r) {
- QRect cr = contentsRect();
- QRegion fr( frameRect() );
- fr = fr.subtract( contentsRect() );
- setFrameRect( r );
-- if ( isVisible() ) {
-+ if ( isVisible() ) {
- cr = cr.intersect( contentsRect() );
- fr = fr.unite( frameRect() );
- fr = fr.subtract( cr );
diff --git a/qt/qt-2.3.7.patch/qte237-lefthand.patch b/qt/qt-2.3.7.patch/qte237-lefthand.patch
index 1cddd29..0a0cccf 100644
--- a/qt/qt-2.3.7.patch/qte237-lefthand.patch
+++ b/qt/qt-2.3.7.patch/qte237-lefthand.patch
@@ -1,126 +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 @@
+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 ) );
--
++
}
-@@ -684,11 +683,6 @@
+@@ -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;
++/*
++ 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 @@
+@@ -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;
++ 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,
+- setHBarGeometry(d->hbar, fw, h-hsbExt-fw,
++ setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw,
right-fw-fw, hsbExt );
else
-- setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right,
-+ setHBarGeometry(d->hbar, 0, h-hsbExt, right,
+- 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 + xoffset, tmarg,
-+ clipper()->setGeometry( lmarg, tmarg,
+- 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(xoffset, 0, w, h) );
-+ changeFrameRect(QRect(0, 0, w, h) );
+- changeFrameRect(QRect(0, 0, w, h) );
++ changeFrameRect(QRect(xoffset, 0, w, h) );
else
-- changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom));
-+ changeFrameRect(QRect(0, 0, w-vsbExt, bottom));
+- changeFrameRect(QRect(0, 0, w-vsbExt, bottom));
++ changeFrameRect(QRect(xoffset, 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 );
+- 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, xpos, ypos,
-+ setVBarGeometry( d->vbar, w-vsbExt, 0,
+- setVBarGeometry( d->vbar, w-vsbExt, 0,
++ setVBarGeometry( d->vbar, xpos, ypos,
vsbExt,
-- bottom-ypos );
-+ h-hsbExt );
+- h-hsbExt );
++ bottom-ypos );
}
else {
if ( style() == WindowsStyle )
-- setVBarGeometry( d->vbar, xpos,
-- ypos, vsbExt,
-- bottom-fw-ypos );
-+ setVBarGeometry( d->vbar, w-vsbExt-fw,
-+ fw, vsbExt,
-+ bottom-fw-fw );
+- setVBarGeometry( d->vbar, w-vsbExt-fw,
+- fw, vsbExt,
+- bottom-fw-fw );
++ setVBarGeometry( d->vbar, xpos,
++ ypos, vsbExt,
++ bottom-fw-ypos );
else
-- setVBarGeometry( d->vbar, xpos, ypos,
-- vsbExt, bottom-ypos );
-+ setVBarGeometry( d->vbar, w-vsbExt, 0,
-+ vsbExt, bottom );
+- setVBarGeometry( d->vbar, w-vsbExt, 0,
+- vsbExt, bottom );
++ setVBarGeometry( d->vbar, xpos, ypos,
++ vsbExt, bottom-ypos );
}
} else {
if ( style() == WindowsStyle )
-@@ -848,12 +837,12 @@
+@@ -837,12 +848,12 @@
}
if ( d->corner ) {
if ( style() == WindowsStyle )
-- d->corner->setGeometry( xpos,
-+ d->corner->setGeometry( w-vsbExt-fw,
+- d->corner->setGeometry( w-vsbExt-fw,
++ d->corner->setGeometry( xpos,
h-hsbExt-fw,
vsbExt,
hsbExt );
else
-- d->corner->setGeometry( xpos,
-+ d->corner->setGeometry( w-vsbExt,
+- d->corner->setGeometry( w-vsbExt,
++ d->corner->setGeometry( xpos,
h-hsbExt,
vsbExt,
hsbExt );
-@@ -1686,7 +1675,7 @@
+@@ -1675,7 +1686,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.
+- 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 )
{