Merge lp:~bhdouglass/mini-maker/MiniMakerFA into lp:~mpredotka/mini-maker/MiniMakerFA

Proposed by Brian Douglass
Status: Needs review
Proposed branch: lp:~bhdouglass/mini-maker/MiniMakerFA
Merge into: lp:~mpredotka/mini-maker/MiniMakerFA
Diff against target: 28 lines (+8/-2)
2 files modified
MiniMakerFA/ElementBase.qml (+4/-2)
clickable.json (+4/-0)
To merge this branch: bzr merge lp:~bhdouglass/mini-maker/MiniMakerFA
Reviewer Review Type Date Requested Status
Michal Predotka Pending
Review via email: mp+380610@code.launchpad.net

Commit message

Fixed adding elements to the play area and added clickable config

To post a comment you must log in.

Unmerged revisions

13. By Brian Douglass

Fixed adding elements to the play area and added clickable config

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'MiniMakerFA/ElementBase.qml'
--- MiniMakerFA/ElementBase.qml 2016-09-07 12:35:39 +0000
+++ MiniMakerFA/ElementBase.qml 2020-03-12 05:03:55 +0000
@@ -31,11 +31,13 @@
31 }31 }
32 onReleased: {32 onReleased: {
33 if (parent.y > panelHeight) {33 if (parent.y > panelHeight) {
34 createElementObjects(parent.mapToItem(play_field).x, parent.mapToItem(play_field).y, elementZ, baseImg, widthStart, sMin, sMax)34 var point = parent.mapToItem(play_field, mouseX, mouseY);
35 var halfWidth = units.gu(8) / 2;
36 createElementObjects(point.x - halfWidth, point.y - halfWidth, elementZ, baseImg, 8, 0.2, 5);
35 }37 }
38
36 parent.x = oldX39 parent.x = oldX
37 parent.y = oldY40 parent.y = oldY
38 }41 }
39 }42 }
40}43}
41
4244
=== added file 'clickable.json'
--- clickable.json 1970-01-01 00:00:00 +0000
+++ clickable.json 2020-03-12 05:03:55 +0000
@@ -0,0 +1,4 @@
1{
2 "template": "pure-qml-qmake",
3 "kill": "qmlscene"
4}

Subscribers

People subscribed via source and target branches