summaryrefslogtreecommitdiffstats
path: root/tests/auto/uiloader
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-12-28 12:58:25 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-01-08 11:56:06 (GMT)
commit71f7c1d006d0942fb91e795855bd00a35f226385 (patch)
tree4b661df3aa014706bc2bd78733438e8e7a24b38b /tests/auto/uiloader
parent30d45394f59c25fc2c3e7e30da4e49bf9744de76 (diff)
downloadQt-71f7c1d006d0942fb91e795855bd00a35f226385.zip
Qt-71f7c1d006d0942fb91e795855bd00a35f226385.tar.gz
Qt-71f7c1d006d0942fb91e795855bd00a35f226385.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)
Diffstat (limited to 'tests/auto/uiloader')
-rw-r--r--tests/auto/uiloader/baseline/css_qtbug6855.ui57
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>