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