From 60a37296cf553fbfb96afc90c7ce84cd386bc151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 16 Nov 2009 17:56:13 +0100 Subject: Fixed QGtkStyle menu bars being one pixel too narrow Probably due to the font height being reduced by one pixel earlier, the menu bar now seems to need both pixels added by the QCleanLooks style. Previously it was ignoring this and adding only one, resulting in a menu bar that was one pixel too narrow compared to a real GTK one. Reviewed-by: mae --- src/gui/styles/qgtkstyle.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 1c78a47..34c7ac8 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -3198,10 +3198,6 @@ QSize QGtkStyle::sizeFromContents(ContentsType type, const QStyleOption *option, } break; - case CT_MenuBarItem://cleanlooks adds 2 pixels - newSize = QWindowsStyle::sizeFromContents(type, option, size, widget) + QSize(0, 1); - break; - case CT_LineEdit: { GtkWidget *gtkEntry = d->gtkWidget(QLS("GtkEntry")); newSize = size + QSize(2*gtkEntry->style->xthickness, 2*gtkEntry->style->ythickness); -- cgit v0.12