diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-29 01:00:09 +0100 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-29 14:46:15 +0000 |
commit | 78a69fa05e3b2af6ed640692d81e2b1c355fe525 (patch) | |
tree | 6f8d9e4900ea413ad7495859323c4945ef5c5897 /src/quick/items/qquicktextinput.cpp | |
parent | e4e8b27f1a10d023a0e5388890e480754a5ab39d (diff) | |
parent | a4fe2d92099e33da39ad1216063a5869990eeab2 (diff) |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index eda2029783..6e0eb4e574 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -4695,6 +4695,18 @@ void QQuickTextInput::clear() These properties hold the padding around the content. This space is reserved in addition to the contentWidth and contentHeight. + + The individual padding properties assume the value of the \c padding + property unless they are set explicitly. For example, if \c padding is + set to \c 4 and \c leftPadding to \c 8, \c 8 will be used as the left + padding. + + \note If an explicit width or height is given to a TextInput, care must be + taken to ensure it is large enough to accommodate the relevant padding + values. For example: if \c topPadding and \c bottomPadding are set to + \c 10, but the height of the TextInput is only set to \c 20, the text will + not have enough vertical space in which to be rendered, and will appear + clipped. */ qreal QQuickTextInput::padding() const { |