3815 if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) { |
3815 if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) { |
3816 if (!btn->text.isEmpty() && newSize.width() < 80) |
3816 if (!btn->text.isEmpty() && newSize.width() < 80) |
3817 newSize.setWidth(80); |
3817 newSize.setWidth(80); |
3818 if (!btn->icon.isNull() && btn->iconSize.height() > 16) |
3818 if (!btn->icon.isNull() && btn->iconSize.height() > 16) |
3819 newSize -= QSize(0, 2); |
3819 newSize -= QSize(0, 2); |
|
3820 newSize += QSize(0, 1); |
3820 } |
3821 } |
3821 if (const QPushButton *button = qobject_cast<const QPushButton *>(widget)) { |
3822 if (const QPushButton *button = qobject_cast<const QPushButton *>(widget)) { |
3822 if (qobject_cast<const QDialogButtonBox *>(button->parentWidget())) { |
3823 if (qobject_cast<const QDialogButtonBox *>(button->parentWidget())) { |
3823 if (newSize.height() < 32) |
3824 if (newSize.height() < 32) |
3824 newSize.setHeight(32); |
3825 newSize.setHeight(32); |
3825 } |
3826 } |
3826 } |
3827 } |
3827 break; |
3828 break; |
|
3829 #ifndef QT_NO_GROUPBOX |
3828 case CT_GroupBox: |
3830 case CT_GroupBox: |
3829 // Since we use a bold font we have to recalculate base width |
3831 // Since we use a bold font we have to recalculate base width |
3830 if (const QGroupBox *gb = qobject_cast<const QGroupBox*>(widget)) { |
3832 if (const QGroupBox *gb = qobject_cast<const QGroupBox*>(widget)) { |
3831 QFont font = gb->font(); |
3833 QFont font = gb->font(); |
3832 font.setBold(true); |
3834 font.setBold(true); |
3838 } |
3840 } |
3839 newSize.setWidth(qMax(baseWidth, newSize.width())); |
3841 newSize.setWidth(qMax(baseWidth, newSize.width())); |
3840 } |
3842 } |
3841 newSize += QSize(0, 1); |
3843 newSize += QSize(0, 1); |
3842 break; |
3844 break; |
|
3845 #endif //QT_NO_GROUPBOX |
3843 case CT_RadioButton: |
3846 case CT_RadioButton: |
3844 case CT_CheckBox: |
3847 case CT_CheckBox: |
3845 newSize += QSize(0, 1); |
3848 newSize += QSize(0, 1); |
3846 break; |
3849 break; |
3847 case CT_ToolButton: |
3850 case CT_ToolButton: |
3864 break; |
3867 break; |
3865 case CT_MenuItem: |
3868 case CT_MenuItem: |
3866 if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) { |
3869 if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) { |
3867 if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) { |
3870 if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) { |
3868 if (!menuItem->text.isEmpty()) { |
3871 if (!menuItem->text.isEmpty()) { |
3869 newSize.setHeight(menuItem->fontMetrics.lineSpacing()); |
3872 newSize.setHeight(menuItem->fontMetrics.height()); |
3870 } |
3873 } |
3871 } |
3874 } |
3872 #ifndef QT_NO_COMBOBOX |
3875 #ifndef QT_NO_COMBOBOX |
3873 else if (!menuItem->icon.isNull()) { |
3876 else if (!menuItem->icon.isNull()) { |
3874 if (const QComboBox *combo = qobject_cast<const QComboBox*>(widget)) { |
3877 if (const QComboBox *combo = qobject_cast<const QComboBox*>(widget)) { |