author | zecke <zecke> | 2004-07-23 18:18:15 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-23 18:18:15 (UTC) |
commit | f9499e14b777050f0bdb3821ca8421dd4c7231fd (patch) (unidiff) | |
tree | 7d96a449aa3b211bd7c5bc9f4d5a7908005cd287 /qt/qt-2.3.8.patch/qte238-adjustsizes.patch | |
parent | 984ab6b8bccf667a89062d959defed4a5d86bfb1 (diff) | |
download | opie-f9499e14b777050f0bdb3821ca8421dd4c7231fd.zip opie-f9499e14b777050f0bdb3821ca8421dd4c7231fd.tar.gz opie-f9499e14b777050f0bdb3821ca8421dd4c7231fd.tar.bz2 |
Split up the patches for Qt2.3.7 and Qt2.3.8 and add comments
on what they do
Diffstat (limited to 'qt/qt-2.3.8.patch/qte238-adjustsizes.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qt/qt-2.3.8.patch/qte238-adjustsizes.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/qt/qt-2.3.8.patch/qte238-adjustsizes.patch b/qt/qt-2.3.8.patch/qte238-adjustsizes.patch new file mode 100644 index 0000000..b2a7f7e --- a/dev/null +++ b/qt/qt-2.3.8.patch/qte238-adjustsizes.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | Qt was not created for 240x320 and we adjust some default values to be more | ||
2 | sane for the usage on handhelds | ||
3 | |||
4 | |||
5 | diff -ur qt-2.3.8-old/src/widgets/qcommonstyle.cpp qt-2.3.8/src/widgets/qcommonstyle.cpp | ||
6 | --- qt-2.3.8-old/src/widgets/qcommonstyle.cpp2004-07-22 01:07:44.000000000 +0200 | ||
7 | +++ qt-2.3.8/src/widgets/qcommonstyle.cpp2004-07-23 16:15:16.000000000 +0200 | ||
8 | @@ -566,7 +566,7 @@ | ||
9 | bool enabled, bool active ) | ||
10 | { | ||
11 | #ifndef QT_NO_MENUBAR | ||
12 | -#ifndef QT_NO_STYLE_SGI | ||
13 | +#if 1 // #ifndef QT_NO_STYLE_SGI | ||
14 | if (draw_menu_bar_impl != 0) { | ||
15 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | ||
16 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | ||
17 | diff -ur qt-2.3.8-old/src/widgets/qlistview.cpp qt-2.3.8/src/widgets/qlistview.cpp | ||
18 | --- qt-2.3.8-old/src/widgets/qlistview.cpp2004-07-22 01:07:44.000000000 +0200 | ||
19 | +++ qt-2.3.8/src/widgets/qlistview.cpp2004-07-23 16:15:16.000000000 +0200 | ||
20 | @@ -5054,9 +5054,9 @@ | ||
21 | l = l->childItem ? l->childItem : l->siblingItem; | ||
22 | |||
23 | if ( l && l->height() ) | ||
24 | -s.setHeight( s.height() + 10 * l->height() ); | ||
25 | - else | ||
26 | -s.setHeight( s.height() + 140 ); | ||
27 | +s.setHeight( s.height() + 4 /*10*/ * l->height() ); | ||
28 | + else // ^v much too big for handhelds | ||
29 | +s.setHeight( s.height() + 30 /*140*/ ); | ||
30 | |||
31 | if ( s.width() > s.height() * 3 ) | ||
32 | s.setHeight( s.width() / 3 ); | ||
33 | Nur in qt-2.3.8/src/widgets/: qlistview.cpp.orig. | ||
34 | diff -ur qt-2.3.8-old/src/widgets/qtoolbutton.cpp qt-2.3.8/src/widgets/qtoolbutton.cpp | ||
35 | --- qt-2.3.8-old/src/widgets/qtoolbutton.cpp2004-07-22 01:07:44.000000000 +0200 | ||
36 | +++ qt-2.3.8/src/widgets/qtoolbutton.cpp2004-07-23 16:15:16.000000000 +0200 | ||
37 | @@ -232,7 +232,7 @@ | ||
38 | else | ||
39 | QToolTip::add( this, textLabel ); | ||
40 | } | ||
41 | -#endif | ||
42 | +#endif | ||
43 | } | ||
44 | |||
45 | |||
46 | @@ -326,12 +326,12 @@ | ||
47 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); | ||
48 | w = pm.width(); | ||
49 | h = pm.height(); | ||
50 | -if ( w < 32 ) | ||
51 | - w = 32; | ||
52 | -if ( h < 32 ) | ||
53 | - h = 32; | ||
54 | +if ( w < 24 ) | ||
55 | + w = 24; | ||
56 | +if ( h < 24 ) | ||
57 | + h = 24; | ||
58 | } else { | ||
59 | -w = h = 16; | ||
60 | +w = h = 14; | ||
61 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); | ||
62 | w = pm.width(); | ||
63 | h = pm.height(); | ||
64 | Nur in qt-2.3.8/src/widgets/: qtoolbutton.cpp.orig. | ||