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/qquicktextedit_p_p.h | |
| 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/qquicktextedit_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index 90ed7f071e..1ff141f3d5 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_p.h @@ -94,7 +94,7 @@ public: bool explicitLeftPadding : 1; bool explicitRightPadding : 1; bool explicitBottomPadding : 1; - bool explicitImplicitSize : 1; + bool implicitResize : 1; }; QLazilyAllocated<ExtraData> extra; @@ -155,6 +155,13 @@ public: void setRightPadding(qreal value, bool reset = false); void setBottomPadding(qreal value, bool reset = false); + void setImplicitResizeEnabled(bool enabled) { + if (!enabled) + extra.value().implicitResize = false; + else if (extra.isAllocated()) + extra->implicitResize = true; + } + QColor color; QColor selectionColor; QColor selectedTextColor; |