-rw-r--r-- | qt/qt-2.3.7.patch/qte237-lefthand.patch | 126 |
1 files changed, 63 insertions, 63 deletions
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 @@ | |||
1 | diff -u qt-2.3.7/src/widgets/qscrollview.cpp qt-2.3.7_orig/src/widgets/qscrollview.cpp | 1 | diff -u qt-2.3.7_orig/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollview.cpp |
2 | --- qt-2.3.7/src/widgets/qscrollview.cpp2004-06-13 20:45:16.000000000 +0200 | 2 | --- qt-2.3.7_orig/src/widgets/qscrollview.cpp2004-06-13 20:42:54.000000000 +0200 |
3 | +++ qt-2.3.7_orig/src/widgets/qscrollview.cpp2004-06-13 20:42:54.000000000 +0200 | 3 | +++ qt-2.3.7/src/widgets/qscrollview.cpp2004-06-13 20:45:16.000000000 +0200 |
4 | @@ -526,16 +526,15 @@ | 4 | @@ -526,15 +526,16 @@ |
5 | this, SLOT( doDragAutoScroll() ) ); | 5 | this, SLOT( doDragAutoScroll() ) ); |
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | - connect( &d->hbar, SIGNAL( valueChanged(int) ), | 8 | - connect( &d->hbar, SIGNAL( valueChanged( int ) ), |
9 | -this, SLOT( hslide(int) ) ); | 9 | -this, SLOT( hslide( int ) ) ); |
10 | - connect( &d->vbar, SIGNAL( valueChanged(int) ), | 10 | - connect( &d->vbar, SIGNAL( valueChanged( int ) ), |
11 | -this, SLOT( vslide(int) ) ); | 11 | -this, SLOT( vslide( int ) ) ); |
12 | + connect( &d->hbar, SIGNAL( valueChanged( int ) ), | 12 | + connect( &d->hbar, SIGNAL( valueChanged(int) ), |
13 | +this, SLOT( hslide( int ) ) ); | 13 | +this, SLOT( hslide(int) ) ); |
14 | + connect( &d->vbar, SIGNAL( valueChanged( int ) ), | 14 | + connect( &d->vbar, SIGNAL( valueChanged(int) ), |
15 | +this, SLOT( vslide( int ) ) ); | 15 | +this, SLOT( vslide(int) ) ); |
16 | d->viewport.installEventFilter( this ); | 16 | d->viewport.installEventFilter( this ); |
17 | 17 | ||
18 | setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); | 18 | setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); |
19 | setLineWidth( style().defaultFrameWidth() ); | 19 | setLineWidth( style().defaultFrameWidth() ); |
20 | setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); | 20 | setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); |
21 | - | 21 | + |
22 | } | 22 | } |
23 | 23 | ||
24 | 24 | ||
25 | @@ -684,11 +683,6 @@ | 25 | @@ -683,6 +684,11 @@ |
26 | h-tmarg-bmarg - (showh ? hsbExt : 0) ); | 26 | h-tmarg-bmarg - (showh ? hsbExt : 0) ); |
27 | } | 27 | } |
28 | 28 | ||
29 | -/* | 29 | +/* |
30 | - The surrounding environment (or application, if there is no | 30 | + The surrounding environment (or application, if there is no |
31 | - environment, may set this. Requires Qt >= 2.3.8. | 31 | + environment, may set this. Requires Qt >= 2.3.8. |
32 | -*/ | 32 | +*/ |
33 | -bool qt_left_hand_scrollbars = FALSE; | 33 | +bool qt_left_hand_scrollbars = FALSE; |
34 | 34 | ||
35 | /*! | 35 | /*! |
36 | Updates scrollbars - all possibilities considered. You should never | 36 | Updates scrollbars - all possibilities considered. You should never |
37 | @@ -792,50 +786,45 @@ | 37 | @@ -786,45 +792,50 @@ |
38 | 38 | ||
39 | // Position the scrollbars, viewport, and corner widget. | 39 | // Position the scrollbars, viewport, and corner widget. |
40 | int bottom; | 40 | int bottom; |
41 | - int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0; | 41 | + int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0; |
42 | - int xpos = qt_left_hand_scrollbars ? 0 : w-vsbExt; | 42 | + int xpos = qt_left_hand_scrollbars ? 0 : w-vsbExt; |
43 | - xpos = (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw; | 43 | + xpos = (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw; |
44 | - int ypos = tmarg; | 44 | + int ypos = tmarg; |
45 | - ypos = (style() == WindowsStyle) ? ypos +fw : 0; | 45 | + ypos = (style() == WindowsStyle) ? ypos +fw : 0; |
46 | if ( showh ) { | 46 | if ( showh ) { |
47 | int right = ( showv || cornerWidget() ) ? w-vsbExt : w; | 47 | int right = ( showv || cornerWidget() ) ? w-vsbExt : w; |
48 | if ( style() == WindowsStyle ) | 48 | if ( style() == WindowsStyle ) |
49 | - setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw, | 49 | - setHBarGeometry(d->hbar, fw, h-hsbExt-fw, |
50 | + setHBarGeometry(d->hbar, fw, h-hsbExt-fw, | 50 | + setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw, |
51 | right-fw-fw, hsbExt ); | 51 | right-fw-fw, hsbExt ); |
52 | else | 52 | else |
53 | - setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right, | 53 | - setHBarGeometry(d->hbar, 0, h-hsbExt, right, |
54 | + setHBarGeometry(d->hbar, 0, h-hsbExt, right, | 54 | + setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right, |
55 | hsbExt ); | 55 | hsbExt ); |
56 | bottom=h-hsbExt; | 56 | bottom=h-hsbExt; |
57 | } else { | 57 | } else { |
58 | bottom=h; | 58 | bottom=h; |
59 | } | 59 | } |
60 | if ( showv ) { | 60 | if ( showv ) { |
61 | -clipper()->setGeometry( lmarg + xoffset, tmarg, | 61 | -clipper()->setGeometry( lmarg, tmarg, |
62 | +clipper()->setGeometry( lmarg, tmarg, | 62 | +clipper()->setGeometry( lmarg + xoffset, tmarg, |
63 | w-vsbExt-lmarg-rmarg, | 63 | w-vsbExt-lmarg-rmarg, |
64 | bottom-tmarg-bmarg ); | 64 | bottom-tmarg-bmarg ); |
65 | d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg ); | 65 | d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg ); |
66 | if ( style() == WindowsStyle ) | 66 | if ( style() == WindowsStyle ) |
67 | - changeFrameRect(QRect(xoffset, 0, w, h) ); | 67 | - changeFrameRect(QRect(0, 0, w, h) ); |
68 | + changeFrameRect(QRect(0, 0, w, h) ); | 68 | + changeFrameRect(QRect(xoffset, 0, w, h) ); |
69 | else | 69 | else |
70 | - changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom)); | 70 | - changeFrameRect(QRect(0, 0, w-vsbExt, bottom)); |
71 | + changeFrameRect(QRect(0, 0, w-vsbExt, bottom)); | 71 | + changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom)); |
72 | if (cornerWidget()) { | 72 | if (cornerWidget()) { |
73 | if ( style() == WindowsStyle ) | 73 | if ( style() == WindowsStyle ) |
74 | - setVBarGeometry( d->vbar, xpos, | 74 | - setVBarGeometry( d->vbar, w-vsbExt-fw, |
75 | - ypos, vsbExt, | 75 | - fw, vsbExt, |
76 | - bottom-fw-ypos ); | 76 | - h-hsbExt-fw-fw ); |
77 | + setVBarGeometry( d->vbar, w-vsbExt-fw, | 77 | + setVBarGeometry( d->vbar, xpos, |
78 | + fw, vsbExt, | 78 | + ypos, vsbExt, |
79 | + h-hsbExt-fw-fw ); | 79 | + bottom-fw-ypos ); |
80 | else | 80 | else |
81 | - setVBarGeometry( d->vbar, xpos, ypos, | 81 | - setVBarGeometry( d->vbar, w-vsbExt, 0, |
82 | + setVBarGeometry( d->vbar, w-vsbExt, 0, | 82 | + setVBarGeometry( d->vbar, xpos, ypos, |
83 | vsbExt, | 83 | vsbExt, |
84 | - bottom-ypos ); | 84 | - h-hsbExt ); |
85 | + h-hsbExt ); | 85 | + bottom-ypos ); |
86 | } | 86 | } |
87 | else { | 87 | else { |
88 | if ( style() == WindowsStyle ) | 88 | if ( style() == WindowsStyle ) |
89 | - setVBarGeometry( d->vbar, xpos, | 89 | - setVBarGeometry( d->vbar, w-vsbExt-fw, |
90 | - ypos, vsbExt, | 90 | - fw, vsbExt, |
91 | - bottom-fw-ypos ); | 91 | - bottom-fw-fw ); |
92 | + setVBarGeometry( d->vbar, w-vsbExt-fw, | 92 | + setVBarGeometry( d->vbar, xpos, |
93 | + fw, vsbExt, | 93 | + ypos, vsbExt, |
94 | + bottom-fw-fw ); | 94 | + bottom-fw-ypos ); |
95 | else | 95 | else |
96 | - setVBarGeometry( d->vbar, xpos, ypos, | 96 | - setVBarGeometry( d->vbar, w-vsbExt, 0, |
97 | - vsbExt, bottom-ypos ); | 97 | - vsbExt, bottom ); |
98 | + setVBarGeometry( d->vbar, w-vsbExt, 0, | 98 | + setVBarGeometry( d->vbar, xpos, ypos, |
99 | + vsbExt, bottom ); | 99 | + vsbExt, bottom-ypos ); |
100 | } | 100 | } |
101 | } else { | 101 | } else { |
102 | if ( style() == WindowsStyle ) | 102 | if ( style() == WindowsStyle ) |
103 | @@ -848,12 +837,12 @@ | 103 | @@ -837,12 +848,12 @@ |
104 | } | 104 | } |
105 | if ( d->corner ) { | 105 | if ( d->corner ) { |
106 | if ( style() == WindowsStyle ) | 106 | if ( style() == WindowsStyle ) |
107 | - d->corner->setGeometry( xpos, | 107 | - d->corner->setGeometry( w-vsbExt-fw, |
108 | + d->corner->setGeometry( w-vsbExt-fw, | 108 | + d->corner->setGeometry( xpos, |
109 | h-hsbExt-fw, | 109 | h-hsbExt-fw, |
110 | vsbExt, | 110 | vsbExt, |
111 | hsbExt ); | 111 | hsbExt ); |
112 | else | 112 | else |
113 | - d->corner->setGeometry( xpos, | 113 | - d->corner->setGeometry( w-vsbExt, |
114 | + d->corner->setGeometry( w-vsbExt, | 114 | + d->corner->setGeometry( xpos, |
115 | h-hsbExt, | 115 | h-hsbExt, |
116 | vsbExt, | 116 | vsbExt, |
117 | hsbExt ); | 117 | hsbExt ); |
118 | @@ -1686,7 +1675,7 @@ | 118 | @@ -1675,7 +1686,7 @@ |
119 | } | 119 | } |
120 | 120 | ||
121 | /*! | 121 | /*! |
122 | - Scrolls the content by \a dx to the left and \a dy upwards. | 122 | - Scrolls the content by \a x to the left and \a y upwards. |
123 | + Scrolls the content by \a x to the left and \a y upwards. | 123 | + Scrolls the content by \a dx to the left and \a dy upwards. |
124 | */ | 124 | */ |
125 | void QScrollView::scrollBy( int dx, int dy ) | 125 | void QScrollView::scrollBy( int dx, int dy ) |
126 | { | 126 | { |