author | mickeyl <mickeyl> | 2005-02-19 16:07:58 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-02-19 16:07:58 (UTC) |
commit | b7bf9c7acdc010eb30bc246372efb0d1b394166a (patch) (unidiff) | |
tree | 8dde116603cd8ddf439a881fc4a1d8f413af617b /qt/qt-2.3.7.patch/qte237-lefthand.patch | |
parent | 298d0d244ca724405ca0651775ed61a22ce7a5ae (diff) | |
download | opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.zip opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.tar.gz opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.tar.bz2 |
hello qte2.3.10 patches
bye bye old patches
Diffstat (limited to 'qt/qt-2.3.7.patch/qte237-lefthand.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-lefthand.patch | 133 |
1 files changed, 0 insertions, 133 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-lefthand.patch b/qt/qt-2.3.7.patch/qte237-lefthand.patch deleted file mode 100644 index 1287430..0000000 --- a/qt/qt-2.3.7.patch/qte237-lefthand.patch +++ b/dev/null | |||
@@ -1,133 +0,0 @@ | |||
1 | Backport of the LeftHand patch from Qt2.3.8 | ||
2 | |||
3 | Puts Scrollbar on the left for people using the right hand | ||
4 | to hold the devices | ||
5 | |||
6 | |||
7 | |||
8 | diff -u qt-2.3.7_orig/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollview.cpp | ||
9 | --- qt-2.3.7_orig/src/widgets/qscrollview.cpp2004-06-13 20:42:54.000000000 +0200 | ||
10 | +++ qt-2.3.7/src/widgets/qscrollview.cpp2004-06-13 20:45:16.000000000 +0200 | ||
11 | @@ -526,15 +526,16 @@ | ||
12 | this, SLOT( doDragAutoScroll() ) ); | ||
13 | #endif | ||
14 | |||
15 | - connect( &d->hbar, SIGNAL( valueChanged( int ) ), | ||
16 | -this, SLOT( hslide( int ) ) ); | ||
17 | - connect( &d->vbar, SIGNAL( valueChanged( int ) ), | ||
18 | -this, SLOT( vslide( int ) ) ); | ||
19 | + connect( &d->hbar, SIGNAL( valueChanged(int) ), | ||
20 | +this, SLOT( hslide(int) ) ); | ||
21 | + connect( &d->vbar, SIGNAL( valueChanged(int) ), | ||
22 | +this, SLOT( vslide(int) ) ); | ||
23 | d->viewport.installEventFilter( this ); | ||
24 | |||
25 | setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); | ||
26 | setLineWidth( style().defaultFrameWidth() ); | ||
27 | setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); | ||
28 | + | ||
29 | } | ||
30 | |||
31 | |||
32 | @@ -683,6 +684,11 @@ | ||
33 | h-tmarg-bmarg - (showh ? hsbExt : 0) ); | ||
34 | } | ||
35 | |||
36 | +/* | ||
37 | + The surrounding environment (or application, if there is no | ||
38 | + environment, may set this. Requires Qt >= 2.3.8. | ||
39 | +*/ | ||
40 | +bool qt_left_hand_scrollbars = FALSE; | ||
41 | |||
42 | /*! | ||
43 | Updates scrollbars - all possibilities considered. You should never | ||
44 | @@ -786,45 +792,50 @@ | ||
45 | |||
46 | // Position the scrollbars, viewport, and corner widget. | ||
47 | int bottom; | ||
48 | + int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0; | ||
49 | + int xpos = qt_left_hand_scrollbars ? 0 : w-vsbExt; | ||
50 | + xpos = (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw; | ||
51 | + int ypos = tmarg; | ||
52 | + ypos = (style() == WindowsStyle) ? ypos +fw : 0; | ||
53 | if ( showh ) { | ||
54 | int right = ( showv || cornerWidget() ) ? w-vsbExt : w; | ||
55 | if ( style() == WindowsStyle ) | ||
56 | - setHBarGeometry(d->hbar, fw, h-hsbExt-fw, | ||
57 | + setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw, | ||
58 | right-fw-fw, hsbExt ); | ||
59 | else | ||
60 | - setHBarGeometry(d->hbar, 0, h-hsbExt, right, | ||
61 | + setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right, | ||
62 | hsbExt ); | ||
63 | bottom=h-hsbExt; | ||
64 | } else { | ||
65 | bottom=h; | ||
66 | } | ||
67 | if ( showv ) { | ||
68 | -clipper()->setGeometry( lmarg, tmarg, | ||
69 | +clipper()->setGeometry( lmarg + xoffset, tmarg, | ||
70 | w-vsbExt-lmarg-rmarg, | ||
71 | bottom-tmarg-bmarg ); | ||
72 | d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg ); | ||
73 | if ( style() == WindowsStyle ) | ||
74 | - changeFrameRect(QRect(0, 0, w, h) ); | ||
75 | + changeFrameRect(QRect(xoffset, 0, w, h) ); | ||
76 | else | ||
77 | - changeFrameRect(QRect(0, 0, w-vsbExt, bottom)); | ||
78 | + changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom)); | ||
79 | if (cornerWidget()) { | ||
80 | if ( style() == WindowsStyle ) | ||
81 | - setVBarGeometry( d->vbar, w-vsbExt-fw, | ||
82 | - fw, vsbExt, | ||
83 | - h-hsbExt-fw-fw ); | ||
84 | + setVBarGeometry( d->vbar, xpos, | ||
85 | + ypos, vsbExt, | ||
86 | + bottom-fw-ypos ); | ||
87 | else | ||
88 | - setVBarGeometry( d->vbar, w-vsbExt, 0, | ||
89 | + setVBarGeometry( d->vbar, xpos, ypos, | ||
90 | vsbExt, | ||
91 | - h-hsbExt ); | ||
92 | + bottom-ypos ); | ||
93 | } | ||
94 | else { | ||
95 | if ( style() == WindowsStyle ) | ||
96 | - setVBarGeometry( d->vbar, w-vsbExt-fw, | ||
97 | - fw, vsbExt, | ||
98 | - bottom-fw-fw ); | ||
99 | + setVBarGeometry( d->vbar, xpos, | ||
100 | + ypos, vsbExt, | ||
101 | + bottom-fw-ypos ); | ||
102 | else | ||
103 | - setVBarGeometry( d->vbar, w-vsbExt, 0, | ||
104 | - vsbExt, bottom ); | ||
105 | + setVBarGeometry( d->vbar, xpos, ypos, | ||
106 | + vsbExt, bottom-ypos ); | ||
107 | } | ||
108 | } else { | ||
109 | if ( style() == WindowsStyle ) | ||
110 | @@ -837,12 +848,12 @@ | ||
111 | } | ||
112 | if ( d->corner ) { | ||
113 | if ( style() == WindowsStyle ) | ||
114 | - d->corner->setGeometry( w-vsbExt-fw, | ||
115 | + d->corner->setGeometry( xpos, | ||
116 | h-hsbExt-fw, | ||
117 | vsbExt, | ||
118 | hsbExt ); | ||
119 | else | ||
120 | - d->corner->setGeometry( w-vsbExt, | ||
121 | + d->corner->setGeometry( xpos, | ||
122 | h-hsbExt, | ||
123 | vsbExt, | ||
124 | hsbExt ); | ||
125 | @@ -1675,7 +1686,7 @@ | ||
126 | } | ||
127 | |||
128 | /*! | ||
129 | - Scrolls the content by \a x to the left and \a y upwards. | ||
130 | + Scrolls the content by \a dx to the left and \a dy upwards. | ||
131 | */ | ||
132 | void QScrollView::scrollBy( int dx, int dy ) | ||
133 | { | ||