@pavelvasev merge: Merge recursive props #233

henrikrudstrom · 2016-05-06T14:08:44Z

merged recursive properties from @pavelvasev branch
@ChALkeR

ChALkeR · 2016-05-06T14:58:48Z

src/qtcore/qml/QMLEngine.js

-            property.binding.compile();
-            property.update();
+            if (property.needsUpdate)
+               property.update();


ChALkeR · 2016-05-06T15:00:45Z

@henrikrudstrom Thanks! Will take a look at this soon.
I will probably just force-push this branch to fix minor nits, ok?

henrikrudstrom · 2016-05-06T19:41:59Z

Thats totally fine!
Fri 6 May 2016 kl. 17:00 skrev Сковорода Никита Андреевич <
notifications@github.com>:

@henrikrudstrom https://github.com/henrikrudstrom Thanks! Will take a
look at this soon.
I will probably just force-push this branch to fix minor nits, ok?

—
You are receiving this because you were mentioned.

Reply to this email directly or view it on GitHub
#233 (comment)

ChALkeR · 2016-05-08T07:04:33Z

595a29f got missed, I will add that on top.

PR-URL: #233

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR · 2016-05-08T19:51:39Z

I am going to rename evaluatingPropertyTop back to to evaluatingProperty, that was an unneeded change.

Moreover, this breaks code in QMLEngine.js that is dependent on evaluatingProperty.

Update: done.

PR-URL: #233

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR · 2016-05-08T20:18:07Z

Btw, this merges 0aab767, 09b8243, 0e80a6e, 595a29f.

PR-URL: #233

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR · 2016-05-08T21:15:11Z

src/qtcore/qml/qml.js

+        if (i == "id" || i == "$class") { // keep them
+          item[i] = value;
+          continue;
+        }


@pavelvasev, what's going on here? This contradicts the check below, i == 'id' below never fires.

ChALkeR · 2016-05-09T05:45:33Z

Ah, and tracking: #32.

PR-URL: #233

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

PR-URL: #233

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

PR-URL: #233

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR · 2016-06-13T06:26:43Z

Merging #248 broke this.

PR-URL: #233

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR · 2016-06-13T16:58:01Z

Ok, I fixed the rebase.

The last two commits LGTM, the first three seem fine, I will just merge them for now — we can fix things later after the merges are complete =).

stephenmdangelo · 2016-06-23T16:21:25Z

@ChALkeR So, I've run into a use-case where this breaks geometry updating, as the recursion checks within update*Geometry cause the methods to return before properly applying the appropriate updates. Reverting these commits fixes it. I haven't had a chance to pin-point it directly, yet.

I'm guessing it's related to the forced update*Geometry calls at the end of $initializePropertyBindings. It seems to only call them if they are internal connections between those geometry-related property names and the geometry of the item with those properties, which won't take into account places where anchors or geometry-related properties refer to properties on other items.

henrikrudstrom force-pushed the merge-pv-recursive-props branch from 0003bdf to 30dfa27 Compare May 6, 2016 14:12

ChALkeR reviewed May 6, 2016
View reviewed changes

src/qtcore/qml/QMLEngine.js

property.binding.compile();

property.update();

if (property.needsUpdate)

+ property.update();

Copy link

Member

ChALkeR May 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stray +.

ChALkeR force-pushed the merge-pv-recursive-props branch from 30dfa27 to 4201253 Compare May 8, 2016 07:24

ChALkeR pushed a commit that referenced this pull request May 8, 2016

Bugfixes on recursive properties

a79cb96

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request May 8, 2016

tests: Activate recursive props tests

a01481d

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR pushed a commit that referenced this pull request May 8, 2016

recursive mode for $initializePropertyBindings

4201253

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR mentioned this pull request May 8, 2016

Merge fork-pavelvasev #32

Closed

62 tasks

ChALkeR force-pushed the merge-pv-recursive-props branch from 4201253 to e538fc0 Compare May 8, 2016 20:16

ChALkeR pushed a commit that referenced this pull request May 8, 2016

Bugfixes on recursive properties

cb6e9d5

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request May 8, 2016

tests: Activate recursive props tests

34ed2fb

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR pushed a commit that referenced this pull request May 8, 2016

recursive mode for $initializePropertyBindings

e538fc0

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR force-pushed the merge-pv-recursive-props branch from e538fc0 to 3eecc99 Compare May 8, 2016 21:06

ChALkeR pushed a commit that referenced this pull request May 8, 2016

Recursive property calculation on init

ce8e76d

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request May 8, 2016

Fixes to recursive properties dependency checking

32d8a18

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request May 8, 2016

Bugfixes on recursive properties

9cc0927

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request May 8, 2016

tests: Activate recursive props tests

9d9e82d

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR pushed a commit that referenced this pull request May 8, 2016

recursive mode for $initializePropertyBindings

3eecc99

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR reviewed May 8, 2016
View reviewed changes

ChALkeR added the merge label May 8, 2016

ChALkeR changed the title ~~Merge recursive props~~ @pavelvasev merge: Merge recursive props Jun 9, 2016

ChALkeR force-pushed the merge-pv-recursive-props branch from 3eecc99 to f361396 Compare June 13, 2016 06:05

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Recursive property calculation on init

7c36270

PR-URL: #233

ChALkeR force-pushed the merge-pv-recursive-props branch from 88bf3fd to c7f0a9f Compare June 13, 2016 06:16

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Recursive property calculation on init

3bee209

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Fixes to recursive properties dependency checking

55b778c

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Bugfixes on recursive properties

0c0c64a

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

tests: Activate recursive props tests

eb7b47b

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

recursive mode for $initializePropertyBindings

c7f0a9f

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR force-pushed the merge-pv-recursive-props branch from c7f0a9f to f5a8621 Compare June 13, 2016 06:19

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Recursive property calculation on init

3be8f7a

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Fixes to recursive properties dependency checking

7018cbf

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Bugfixes on recursive properties

e17b1f7

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

tests: Activate recursive props tests

6e6e4a0

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

recursive mode for $initializePropertyBindings

f5a8621

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR force-pushed the merge-pv-recursive-props branch from f5a8621 to 5aded0a Compare June 13, 2016 06:22

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Recursive property calculation on init

3408b95

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Fixes to recursive properties dependency checking

de1cb53

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

Bugfixes on recursive properties

294501b

PR-URL: #233

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

tests: Activate recursive props tests

2400667

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR pushed a commit that referenced this pull request Jun 13, 2016

recursive mode for $initializePropertyBindings

5aded0a

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR mentioned this pull request Jun 13, 2016

@igosoft merge: Repeater updates #248

Merged

pavelvasev and others added 5 commits June 13, 2016 19:56

Recursive property calculation on init

8a8fb56

PR-URL: #233

Fixes to recursive properties dependency checking

0b963be

PR-URL: #233

Bugfixes on recursive properties

a068218

PR-URL: #233

tests: Activate recursive props tests

3a5848b

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

recursive mode for $initializePropertyBindings

f8e5e7a

PR-URL: #233 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>

ChALkeR force-pushed the merge-pv-recursive-props branch from 5aded0a to f8e5e7a Compare June 13, 2016 16:56

ChALkeR merged commit f8e5e7a into master Jun 13, 2016

ChALkeR deleted the merge-pv-recursive-props branch June 13, 2016 20:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

@pavelvasev merge: Merge recursive props #233

@pavelvasev merge: Merge recursive props #233

henrikrudstrom commented May 6, 2016

ChALkeR May 6, 2016

ChALkeR commented May 6, 2016

henrikrudstrom commented May 6, 2016

ChALkeR commented May 8, 2016

ChALkeR commented May 8, 2016 •

edited

ChALkeR commented May 8, 2016

ChALkeR May 8, 2016

ChALkeR commented May 9, 2016

ChALkeR commented Jun 13, 2016

ChALkeR commented Jun 13, 2016 •

edited

stephenmdangelo commented Jun 23, 2016

@pavelvasev merge: Merge recursive props #233

@pavelvasev merge: Merge recursive props #233

Conversation

henrikrudstrom commented May 6, 2016

ChALkeR May 6, 2016

Choose a reason for hiding this comment

ChALkeR commented May 6, 2016

henrikrudstrom commented May 6, 2016

ChALkeR commented May 8, 2016

ChALkeR commented May 8, 2016 • edited

ChALkeR commented May 8, 2016

ChALkeR May 8, 2016

Choose a reason for hiding this comment

ChALkeR commented May 9, 2016

ChALkeR commented Jun 13, 2016

ChALkeR commented Jun 13, 2016 • edited

stephenmdangelo commented Jun 23, 2016

ChALkeR commented May 8, 2016 •

edited

ChALkeR commented Jun 13, 2016 •

edited