aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktextinput_p_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-03 14:03:57 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-03 12:54:36 +0000
commit0a5db49d0d57822adc630ac9c2158096bede6d00 (patch)
tree6784b5c2713539b1d9de84022cdfba2ff898b128 /src/quick/items/qquicktextinput_p_p.h
parent4653217c3f36e7914f2cc0573347a078dd11768f (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_p_p.h')
-rw-r--r--src/quick/items/qquicktextinput_p_p.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h
index 4946adc7e7..7e1f18130e 100644
--- a/src/quick/items/qquicktextinput_p_p.h
+++ b/src/quick/items/qquicktextinput_p_p.h
@@ -84,7 +84,7 @@ public:
bool explicitLeftPadding : 1;
bool explicitRightPadding : 1;
bool explicitBottomPadding : 1;
- bool explicitImplicitSize : 1;
+ bool implicitResize : 1;
};
QLazilyAllocated<ExtraData> extra;
@@ -443,6 +443,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;
+ }
+
private:
void removeSelectedText();
void internalSetText(const QString &txt, int pos = -1, bool edited = true);