git.iko.soy/unity8
on xenial help sign in
merge 1238837 branch
1c0e986Omer Akram
Dash/Apps/RunningApplicationTile.qml+6−3
compare with xenial
unifiedsplit
@@ -39,9 +39,7 @@ AbstractButton {
39 property bool terminationModeEnabled: false
39 property bool terminationModeEnabled: false
40
40
41 onClicked: {
41 onClicked: {
42− if (terminationModeEnabled)
42+ if (!terminationModeEnabled)
43− requestedApplicationTermination(application)
44− else
45 requestedApplicationActivation(application)
43 requestedApplicationActivation(application)
46 }
44 }
47
45
@@ -133,5 +131,10 @@ AbstractButton {
133 width: units.gu(6)
131 width: units.gu(6)
134 id: closeIcon
132 id: closeIcon
135 enabled: root.terminationModeEnabled
133 enabled: root.terminationModeEnabled
134+
135+ MouseArea {
136+ anchors { fill: parent; margins: -units.gu(1) }
137+ onClicked: requestedApplicationTermination(application)
138+ }
136 }
139 }
137}
140}
tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml+5−6
@@ -195,8 +195,8 @@ Item {
195 !runningApplicationsGrid.terminationModeEnabled
195 !runningApplicationsGrid.terminationModeEnabled
196 }
196 }
197
197
198− // While on termination mode, clicking a running application tile causes the
198+ // While on termination mode, clicking a running application tile, outside of
199− // corresponding application to be terminated.
199+ // the close icon should do nothing
200 function test_clickTileToTerminateApp() {
200 function test_clickTileToTerminateApp() {
201 runningApplicationsGrid.terminationModeEnabled = true
201 runningApplicationsGrid.terminationModeEnabled = true
202
202
@@ -207,11 +207,10 @@ Item {
207
207
208 mouseClick(calendarTile, calendarTile.width/2, calendarTile.height/2)
208 mouseClick(calendarTile, calendarTile.width/2, calendarTile.height/2)
209
209
210− verify(!fakeRunningAppsModel.contains("calendar"))
210+ verify(fakeRunningAppsModel.contains("calendar"))
211
211
212− // The tile for the Calendar app should eventually vanish since the
212+ // The tile for the Calendar app should stay there
213− // application has been terminated
214− tryCompareFunction(checkCalendarTileExists, false)
213+ tryCompareFunction(checkCalendarTileExists, true)
215 }
214 }
216
215
217 function checkCalendarTileExists() {
216 function checkCalendarTileExists() {