diff options
| author | Tero Ahola <tero.ahola@digia.com> | 2012-02-08 10:26:36 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-14 22:01:52 (GMT) |
| commit | 1566021e623fb79c4ff5475d51010765a3074bbb (patch) | |
| tree | c7a6ad5d99740c9100ec18a51d9099b6aa39f4e8 /tests/auto | |
| parent | 717e36037cf246aa201c0aaf15a5dcbd7883f159 (diff) | |
| download | Qt-1566021e623fb79c4ff5475d51010765a3074bbb.zip Qt-1566021e623fb79c4ff5475d51010765a3074bbb.tar.gz Qt-1566021e623fb79c4ff5475d51010765a3074bbb.tar.bz2 | |
Modified vertical alignments of simple widgets on OSX
Adding QCheckBox, QComboBox, QLineEdit etc. into an HBox layout or grid
layout makes the layout look like a snake's trail. Fixed the positioning
of these widgets to make the layouts visually more appealing.
Updated qmacstyle auto-test accordingly.
Task-number: QTBUG-13635
Ammended-by: Gabriel de Dietrich
Ammended-by: Liang Qi
Change-Id: Ic12346f764d8092292b8388f50d184b37d7cef5f
(cherry picked from qtbase/8b6de4677142cab41790ca50ce6c7f1efbab5de8)
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qmacstyle/tst_qmacstyle.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qmacstyle/tst_qmacstyle.cpp b/tests/auto/qmacstyle/tst_qmacstyle.cpp index 04337fe..21b57e6 100644 --- a/tests/auto/qmacstyle/tst_qmacstyle.cpp +++ b/tests/auto/qmacstyle/tst_qmacstyle.cpp @@ -129,7 +129,7 @@ void tst_QMacStyle::sizeHints() setSize(&w, size); QLineEdit lineEdit1(&w); - QCOMPARE(sh(&lineEdit1).height(), SIZE(22, 19, 16)); // 16 in Builder, 15 in AHIG + QCOMPARE(sh(&lineEdit1).height(), SIZE(21, 19, 16)); // 16 in Builder, 15 in AHIG QProgressBar progress1(&w); progress1.setOrientation(Qt::Horizontal); @@ -140,10 +140,10 @@ void tst_QMacStyle::sizeHints() QCOMPARE(sh(&progress1).width(), SIZE(16, 10, 10)); // Builder QRadioButton radio1("Radio", &w); - QCOMPARE(sh(&radio1).height(), SIZE(15, 12, 10)); // Builder + QCOMPARE(sh(&radio1).height(), SIZE(14, 12, 10)); // Builder QCheckBox checkBox1("Switch", &w); - QCOMPARE(sh(&checkBox1).height(), SIZE(14, 12, 10)); // Builder + QCOMPARE(sh(&checkBox1).height(), SIZE(13, 12, 10)); // Builder QComboBox comboBox1(&w); comboBox1.setEditable(false); @@ -153,7 +153,7 @@ void tst_QMacStyle::sizeHints() QComboBox comboBox2(&w); comboBox2.setEditable(true); comboBox2.addItem("Foo"); - QCOMPARE(sh(&comboBox2).height(), SIZE(20, 17, 15)); + QCOMPARE(sh(&comboBox2).height(), SIZE(22, 17, 15)); // Combos in toolbars use the actual widget rect to // avoid faulty clipping: @@ -231,7 +231,7 @@ void tst_QMacStyle::sizeHints() // QMacStyle bug: label doesn't react to Small and Mini QLabel label1("Blah", &w); - QCOMPARE(sh(&label1).height(), SIZE(17, 14, 11)); + QCOMPARE(sh(&label1).height(), SIZE(16, 14, 11)); } void tst_QMacStyle::layoutMargins_data() |