diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2014-06-12 20:55:21 +0200 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@digia.com> | 2014-06-14 11:59:16 +0200 |
| commit | 16b90bb68343dc45a34d59083a2b62200fcc9551 (patch) | |
| tree | ad338745d01f41f39e0029cfddbb68d0bc157b69 /src/widgets | |
| parent | fb3f47b638fcdeb68c68fbda4943f4fbb22261c6 (diff) | |
QFontComboBox sometimes became too wide because of wrong fixed size
The fixed width should not be set on QFontComboBox itself, but on the
popup.
This regressed with commit bfb25c03523757d66974189e54dda97962206ef9,
and caused assistants preferences dialog to become wider than the
desktop.
Change-Id: I2059794fc12d34837cdb7dfded80df57d102a6f0
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qfontcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index 40ca73904c..db01543629 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -548,7 +548,7 @@ bool QFontComboBox::event(QEvent *e) if (e->type() == QEvent::Resize) { QListView *lview = qobject_cast<QListView*>(view()); if (lview) { - setFixedWidth(qMin(width() * 5 / 3, + lview->window()->setFixedWidth(qMin(width() * 5 / 3, QApplication::desktop()->availableGeometry(lview).width())); } } |