diff options
| author | Dominik Kapusta <dominik.kapusta@teleca.com> | 2011-01-12 13:51:28 +0100 |
|---|---|---|
| committer | Adrian Yanes <ext-adrian.yanes@nokia.com> | 2011-01-13 13:20:25 +0200 |
| commit | b454c83b2635bb3dbdf6800316f68642c40f9303 (patch) | |
| tree | 07bda4955e2a84c7ba7c9892629aff20eb3d109a | |
| parent | bb116f49f44dcc438ee58eb2a87f180b45dfd76e (diff) | |
Fixes: NB#217067
RevBy: TrustMe
Details:
Revert "Fixes: NB#209318 - MLabelView calls updateGeometry() when the text changes."
This reverts commit ef288a62ffeb09f5065cdc8de56e6cbb870e45fb.
| -rw-r--r-- | src/views/mlabelview_p.h | 2 | ||||
| -rw-r--r-- | src/views/mlabelview_simple.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/views/mlabelview_p.h b/src/views/mlabelview_p.h index 96bff53b..9e6fb4d7 100644 --- a/src/views/mlabelview_p.h +++ b/src/views/mlabelview_p.h @@ -229,8 +229,6 @@ public: MLabelViewSimple *impl; QTextOption textOptions; - - QSizeF previousStaticTextSize; }; #endif diff --git a/src/views/mlabelview_simple.cpp b/src/views/mlabelview_simple.cpp index 7a8c26ba..fc73c80a 100644 --- a/src/views/mlabelview_simple.cpp +++ b/src/views/mlabelview_simple.cpp @@ -148,7 +148,6 @@ void MLabelViewSimple::setupModel() } else { viewPrivate->textOptions.setWrapMode(QTextOption::NoWrap); } - viewPrivate->previousStaticTextSize = staticText.size(); } bool MLabelViewSimple::updateData(const QList<const char *>& modifications) @@ -161,8 +160,7 @@ bool MLabelViewSimple::updateData(const QList<const char *>& modifications) foreach(member, modifications) { if (member == MLabelModel::Text) { preferredSize = QSizeF(-1, -1); - needUpdate = viewPrivate->previousStaticTextSize != staticText.size(); - viewPrivate->previousStaticTextSize = staticText.size(); + needUpdate = true; } else if (member == MLabelModel::Color) { needUpdate = true; } else if(member == MLabelModel::WrapMode) { |