diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-28 12:58:25 (GMT) |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2011-05-23 11:20:48 (GMT) |
| commit | eb02a9c18af884412bcb94c9f9a73ee1b9c98000 (patch) | |
| tree | d2e21f695ece0dfc916e8e52ce264b5e72189a2b /tests/auto | |
| parent | d1c5883d2d0fe580ae7a55ce74df1957c41cfbf4 (diff) | |
| download | Qt-eb02a9c18af884412bcb94c9f9a73ee1b9c98000.zip Qt-eb02a9c18af884412bcb94c9f9a73ee1b9c98000.tar.gz Qt-eb02a9c18af884412bcb94c9f9a73ee1b9c98000.tar.bz2 | |
QStyleSheetStyle: Fixed some text croped when having padding with native border.
The native border width need to be taken into account in QRenderRule::boxRect()
Task-number: QTBUG-6855
Reviewed-by: Benjamin Poulain
(cherry picked from commit 6e90192b599cee9b903177a0978198326f667613)
(cherry picked from commit 71f7c1d006d0942fb91e795855bd00a35f226385)
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/uiloader/baseline/css_qtbug6855.ui | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/tests/auto/uiloader/baseline/css_qtbug6855.ui b/tests/auto/uiloader/baseline/css_qtbug6855.ui new file mode 100644 index 0000000..0727f6b --- /dev/null +++ b/tests/auto/uiloader/baseline/css_qtbug6855.ui @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Form</class> + <widget class="QWidget" name="Form"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>212</width> + <height>108</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <property name="styleSheet"> + <string notr="true">QPushButton { padding: 20px; }</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>Text not cropped</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>258</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>218</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> |