@@ -39,7 +39,9 @@ AbstractButton {
39 property bool terminationModeEnabled: false
39 property bool terminationModeEnabled: false
41 onClicked: {
41 onClicked: {
42− if (!terminationModeEnabled)
42+ if (terminationModeEnabled)
43+ requestedApplicationTermination(application)
43 requestedApplicationActivation(application)
45 requestedApplicationActivation(application)
@@ -122,8 +124,8 @@ AbstractButton {
123 CloseIcon {
125 CloseIcon {
124 anchors {
126 anchors {
125− left: shapedApplicationImage.left
127+ right: shapedApplicationImage.right
126− leftMargin: -units.gu(1)
128+ rightMargin: -units.gu(1)
127 top: parent.top
129 top: parent.top
128 topMargin: -units.gu(1)
130 topMargin: -units.gu(1)
@@ -131,19 +133,5 @@ AbstractButton {
131 width: units.gu(6)
133 width: units.gu(6)
132 id: closeIcon
134 id: closeIcon
133 enabled: root.terminationModeEnabled
135 enabled: root.terminationModeEnabled
136− anchors.fill: parent
137− anchors.left: units.gu(1)
138− anchors.right: units.gu(1)
139− anchors.top: units.gu(1)
140− anchors.bottom: units.gu(1)
142− if (terminationModeEnabled)
143− requestedApplicationTermination(application)
145− requestedApplicationActivation(application)