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

Proposed by Brian Douglass
Status: Needs review
Proposed branch: lp:~bhdouglass/mini-maker/MiniMakerFF
Merge into: lp:~mpredotka/mini-maker/MiniMakerFF
Diff against target: 28 lines (+8/-2)
2 files modified
MiniMakerFF/ElementBase.qml (+4/-2)
clickable.json (+4/-0)
To merge this branch: bzr merge lp:~bhdouglass/mini-maker/MiniMakerFF
Reviewer Review Type Date Requested Status
Michal Predotka Pending
Review via email: mp+380609@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

10. 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
1=== modified file 'MiniMakerFF/ElementBase.qml'
2--- MiniMakerFF/ElementBase.qml 2016-06-22 21:54:31 +0000
3+++ MiniMakerFF/ElementBase.qml 2020-03-12 05:03:13 +0000
4@@ -31,11 +31,13 @@
5 }
6 onReleased: {
7 if (parent.y > panelHeight) {
8- createElementObjects(parent.mapToItem(play_field).x, parent.mapToItem(play_field).y, baseImg, widthStart, sMin, sMax)
9+ var point = parent.mapToItem(play_field, mouseX, mouseY);
10+ var halfWidth = units.gu(8) / 2;
11+ createElementObjects(point.x - halfWidth, point.y - halfWidth, baseImg, 8, 0.2, 5);
12 }
13+
14 parent.x = oldX
15 parent.y = oldY
16 }
17 }
18 }
19-
20
21=== added file 'clickable.json'
22--- clickable.json 1970-01-01 00:00:00 +0000
23+++ clickable.json 2020-03-12 05:03:13 +0000
24@@ -0,0 +1,4 @@
25+{
26+ "template": "pure-qml-qmake",
27+ "kill": "qmlscene"
28+}

Subscribers

People subscribed via source and target branches