From 7f469ef4cc614925d7a4fdb3380ff5470e25b03b Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Tue, 21 Aug 2012 17:26:42 +0200 Subject: Remove icons from buttons with Cleanlooks The icon buttons in cleanlooks were modeled after an early version of the Gtk 2.0 Clearlooks theme. At the time, GNOME was using icons on all buttons. For the past couple of years, GNOME has dropped icons on buttons by default and as this is the common behavior on other platforms as well, I think it is time to remove them. The button size hack was also removed due to previously emulating a GNOME behavior. The end result at the moment is only that it makes the button height inconsistent with other widgets. Change-Id: I22fe8c0b3a799a807cfff74a81cebf50e8ec33d3 Reviewed-by: J-P Nurmi Reviewed-by: Gabriel de Dietrich --- src/widgets/styles/qcleanlooksstyle.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/styles/qcleanlooksstyle.cpp b/src/widgets/styles/qcleanlooksstyle.cpp index d617ee7e6f..c648f74963 100644 --- a/src/widgets/styles/qcleanlooksstyle.cpp +++ b/src/widgets/styles/qcleanlooksstyle.cpp @@ -3790,12 +3790,6 @@ QSize QCleanlooksStyle::sizeFromContents(ContentsType type, const QStyleOption * newSize -= QSize(0, 2); newSize += QSize(0, 1); } - if (const QPushButton *button = qobject_cast(widget)) { - if (qobject_cast(button->parentWidget())) { - if (newSize.height() < 32) - newSize.setHeight(32); - } - } break; #ifndef QT_NO_GROUPBOX case CT_GroupBox: @@ -4337,7 +4331,7 @@ int QCleanlooksStyle::styleHint(StyleHint hint, const QStyleOption *option, cons ret = Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse; break; case SH_DialogButtonBox_ButtonsHaveIcons: - ret = true; + ret = false; break; case SH_MessageBox_CenterButtons: ret = false; -- cgit v1.2.3