From dc424c1e2a355a8306c07eb1f67e61b221544aef Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jensb.bache-wiig@nokia.com>
Date: Sat, 3 Sep 2011 16:03:20 +0200
Subject: [PATCH] Remove baseline hack on mac as it breaks the combo box
The styling of comboboxes is incorrect due to this baseline
hack. We need to solve text offset somewhere else
---
src/styleitem/qstyleitem.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/styleitem/qstyleitem.cpp b/src/styleitem/qstyleitem.cpp
index ea1c11a17..54897510b 100644
--- a/src/styleitem/qstyleitem.cpp
+++ b/src/styleitem/qstyleitem.cpp
@@ -576,9 +576,9 @@ QSize QStyleItem::sizeFromContents(int width, int height)
}
#ifdef Q_WS_MAC
- // ### hack - With even heights, the text baseline is off on mac
- if (size.height() %2 == 0)
- size.setHeight(size.height() + 1);
+// ### hack - With even heights, the text baseline is off on mac
+// if (size.height() %2 == 0)
+// size.setHeight(size.height() + 1);
#endif
return size;
}
--
GitLab