diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-02-28 16:56:10 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-06-12 15:09:28 +0200 |
| commit | ee1101043f0da636bf76972232f384e599becd64 (patch) | |
| tree | 1661ccc3cdb2c977ae7f0370d38040f472e08170 /src/quick/items/qquicktextinput_p_p.h | |
| parent | 864f9b79fba25b38a1139d67a7b299b63149c470 (diff) | |
QQuickTextInputPrivate: refactor getImplicitWidth() to calculateImplicitWidth()
This patch moves the implicit width calculation in getImplicitWidth()
into calculateImplicitWidth(const QString &text).
This allows QQuickComboBox in qtquickcontrols2 to get the implicit
width of a TextInput (TextField) item, as QQuickTextInput does some
extra layouting and accounting for padding that QFontMetrics does not.
Change-Id: I81e6c2627e21ca4d89ea9502abbb6aec79068793
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/items/qquicktextinput_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index 7965f3d3f4..a5c5d26dfe 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_p.h @@ -456,6 +456,7 @@ public: void updateLayout(); void updateBaselineOffset(); + qreal calculateImplicitWidthForText(const QString &text) const; qreal getImplicitWidth() const override; inline qreal padding() const { return extra.isAllocated() ? extra->padding : 0.0; } |