[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qmlweb] src: Fix commit 67abb1d3 "Fix bug with [...] anchors."
From:       Anton Kreuzkamp <akreuzkamp () web ! de>
Date:       2014-02-28 21:00:51
Message-ID: E1WJUY7-0006qC-J0 () scm ! kde ! org
[Download RAW message or body]

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 = false;
-        height = t.height;
+        height = t.height - tM - bM;
         y = t.top - (this.parent ? this.parent.top : 0) + tM;
         top = t.top + tM;
         bottom = t.bottom - bM;
@@ -1245,7 +1245,7 @@ function updateVGeometry(newVal, oldVal, propName) {
         if ((u = anchors.bottom) !== undefined) {
             bottom = u - bM;
             this.$isUsingImplicitHeight = false;
-            height = bottom - top - tM - bM;
+            height = bottom - top;
             y = top - (this.parent ? this.parent.top : 0);
             vC = (bottom + top) / 2;
         } else if ((vC = anchors.verticalCenter) !== undefined) {
[prev in list] [next in list] [prev in thread] [next in thread]