Differential D7852 Diff 19591 src/activities/penalty/Penalty.qml

Changeset View

Standalone View

View Options

src/activities/penalty/Penalty.qml

Context not available.
53 return 53​ return
54 } 54​ }
55 55​
56​ items.saveBallState = saveBallState
57​
56 /* This is a shoot */ 58​ /* This is a shoot */
57 var progress = progressTop 59​ var progress = progressTop
58 if (saveBallState == "LEFT") { 60​ if (saveBallState == "LEFT") {
dmadaanUnsubmitted
Not Done

space before and after "*" and "/"

dmadaan: space before and after "*" and "/"
Context not available.
103 anchors.fill: parent 105​ anchors.fill: parent
104 acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton 106​ acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton
105 onClicked: { 107​ onClicked: {
106 if(mouse.button) { 108​ if(mouse.button && (items.saveBallState == "" || items.saveBallState == "LEFT")) {
jjazeixUnsubmitted
Not Done

I would remove the if.
For (items.saveBallState == "" || items.saveBallState == "LEFT"), I would directly test it in the changeBallState function (more generic, avoid duplication).

jjazeix: I would remove the if. For (items.saveBallState == "" || items.saveBallState == "LEFT"), I…
107 changeBallState("LEFT") 109​ changeBallState("LEFT")
108 } 110​ }
109 } 111​ }
Context not available.
124 anchors.fill: parent 126​ anchors.fill: parent
125 acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton 127​ acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton
126 onClicked: { 128​ onClicked: {
127 if(mouse.button) { 129​ if(mouse.button && (items.saveBallState == "" || items.saveBallState == "CENTER")) {
128 changeBallState("CENTER") 130​ changeBallState("CENTER")
129 } 131​ }
130 } 132​ }
Context not available.
147 anchors.fill: parent 149​ anchors.fill: parent
148 acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton 150​ acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton
149 onClicked: { 151​ onClicked: {
150 if(mouse.button) { 152​ if(mouse.button && (items.saveBallState == "" || items.saveBallState == "RIGHT")) {
151 changeBallState("RIGHT") 153​ changeBallState("RIGHT")
152 } 154​ }
153 } 155​ }
Context not available.
167 property alias bonus: bonus 169​ property alias bonus: bonus
168 property int duration : 0 170​ property int duration : 0
169 property int progressBarOpacity : 40 171​ property int progressBarOpacity : 40
172​ property string saveBallState: ""
jjazeixUnsubmitted
Not Done

I would put "INITIAL" as default value to do the same as ball.state

jjazeix: I would put "INITIAL" as default value to do the same as ball.state
170 } 173​ }
171 174​
172 onStart: { Activity.start(items) } 175​ onStart: { Activity.start(items) }
Context not available.
432 acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton 435​ acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton
433 onClicked: { 436​ onClicked: {
434 ball.state = "INITIAL" 437​ ball.state = "INITIAL"
438​ items.saveBallState = ""
jjazeixUnsubmitted
Not Done

I would put "INITIAL" as default value to do the same as ball.state

jjazeix: I would put "INITIAL" as default value to do the same as ball.state
435 progressRight.ratio = 0 439​ progressRight.ratio = 0
436 progressLeft.ratio = 0 440​ progressLeft.ratio = 0
437 progressTop.ratio = 0 441​ progressTop.ratio = 0
Context not available.