diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-03 14:03:57 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-03 12:54:36 +0000 |
| commit | 0a5db49d0d57822adc630ac9c2158096bede6d00 (patch) | |
| tree | 6784b5c2713539b1d9de84022cdfba2ff898b128 /src/quick/items/qquicktextinput.cpp | |
| parent | 4653217c3f36e7914f2cc0573347a078dd11768f (diff) | |
QQuickTextEdit/Input: revise implicit resizing
Rename explicitImplicitSize to better descriptive implicitResize,
and add a method to disable the default behavior. QQuickTextField
was unable to access the flag directly, because ExtraData is not
exported (and we prefer to keep it that way).
Change-Id: Ia8b8281267adfc376e03a14882708e9cf80f0451
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index d69c489b2d..2303322347 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2518,7 +2518,7 @@ QQuickTextInputPrivate::ExtraData::ExtraData() , explicitLeftPadding(false) , explicitRightPadding(false) , explicitBottomPadding(false) - , explicitImplicitSize(false) + , implicitResize(true) { } @@ -2821,7 +2821,7 @@ void QQuickTextInputPrivate::updateLayout() line.setLineWidth(INT_MAX); const bool wasInLayout = inLayout; inLayout = true; - if (!extra.isAllocated() || !extra->explicitImplicitSize) + if (!extra.isAllocated() || extra->implicitResize) q->setImplicitWidth(qCeil(line.naturalTextWidth()) + q->leftPadding() + q->rightPadding()); inLayout = wasInLayout; if (inLayout) // probably the result of a binding loop, but by letting it @@ -2853,7 +2853,7 @@ void QQuickTextInputPrivate::updateLayout() q->polish(); q->update(); - if (!extra.isAllocated() || !extra->explicitImplicitSize) { + if (!extra.isAllocated() || extra->implicitResize) { if (!requireImplicitWidth && !q->widthValid()) q->setImplicitSize(width + q->leftPadding() + q->rightPadding(), height + q->topPadding() + q->bottomPadding()); else |