From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Fri, 2 Nov 2012 13:27:09 +0000 (+0100)
Subject: Fix height of combobox in macstyle without a widget
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0506c2fbb91f5bf88642bd49166d5378588384e4;p=profile%2Fivi%2Fqtbase.git

Fix height of combobox in macstyle without a widget

When no widget is provided we hardcode the height and the value
was off by 2. There is no change when a widget is provided.

Change-Id: I555b5206b8750db06595a1e2572a3f8212635a9d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
---

diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 04fdb99..b957650 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -6252,6 +6252,7 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
         return sz;
     case CT_ComboBox:
         sz.rwidth() += 50;
+        sz.rheight() += 2;
         break;
     case CT_Menu: {
         QStyleHintReturnMask menuMask;