From kde-commits  Fri Feb 28 21:00:51 2014
From: Anton Kreuzkamp <akreuzkamp () web ! de>
Date: Fri, 28 Feb 2014 21:00:51 +0000
To: kde-commits
Subject: [qmlweb] src: Fix commit 67abb1d3 "Fix bug with [...] anchors."
Message-Id: <E1WJUY7-0006qC-J0 () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=139362126106023

Git commit 5dd7a0b90b97ed073afa69f3bff6d805a2a185ab by Anton Kreuzkamp.
Committed on 27/02/2014 at 21:27.
Pushed by akreuzkamp into branch 'master'.

Fix commit 67abb1d3 "Fix bug with [...] anchors."

That commit was unsatisfactorily tested and breaked anchors and margins even
more by "fixing" the wrong line. This commit now reverts the change to that=
 line
and fixes the correct line.

M  +2    -2    src/qtcore.js

http://commits.kde.org/qmlweb/5dd7a0b90b97ed073afa69f3bff6d805a2a185ab

diff --git a/src/qtcore.js b/src/qtcore.js
index 500652e..93f7502 100644
--- a/src/qtcore.js
+++ b/src/qtcore.js
@@ -1226,7 +1226,7 @@ function updateVGeometry(newVal, oldVal, propName) {
             t.$properties.height.changed.connect(this, updateVGeometry);
 =

         this.$isUsingImplicitHeight =3D false;
-        height =3D t.height;
+        height =3D t.height - tM - bM;
         y =3D t.top - (this.parent ? this.parent.top : 0) + tM;
         top =3D t.top + tM;
         bottom =3D t.bottom - bM;
@@ -1245,7 +1245,7 @@ function updateVGeometry(newVal, oldVal, propName) {
         if ((u =3D anchors.bottom) !=3D=3D undefined) {
             bottom =3D u - bM;
             this.$isUsingImplicitHeight =3D false;
-            height =3D bottom - top - tM - bM;
+            height =3D bottom - top;
             y =3D top - (this.parent ? this.parent.top : 0);
             vC =3D (bottom + top) / 2;
         } else if ((vC =3D anchors.verticalCenter) !=3D=3D undefined) {