on xenial help sign in
Put canEnableTerminationMode stuff back

To cover a minor "visual glitch" in a specific corner case

commit91af41f413c46e1e3bbd5661a82a52963b266605 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateFri 29 Nov 2013, 06:57 (13 years ago) parent39095c1
3 files changed+13−1
Dash/Apps/RunningApplicationsGrid.qml+11−1 Dash/DashApps.qml+1 Dash/GenericScopeView.qml+1
Dash/Apps/RunningApplicationsGrid.qml+11−1
@@ -52,6 +52,13 @@ ResponsiveFlowView {
5252 }
5353 }
5454
55+ property bool canEnableTerminationMode: true
56+
57+ onCanEnableTerminationModeChanged: {
58+ if (!canEnableTerminationMode)
59+ terminationModeEnabled = false
60+ }
61+
5562 // when false, it means it's on activation mode
5663 property bool terminationModeEnabled: false
5764
@@ -73,7 +80,10 @@ ResponsiveFlowView {
7380 }
7481 application: model
7582 onRequestedActivationMode: { root.terminationModeEnabled = false }
76− onRequestedTerminationMode: { root.terminationModeEnabled = true }
83+ onRequestedTerminationMode: {
84+ if (canEnableTerminationMode)
85+ root.terminationModeEnabled = true
86+ }
7787 onRequestedApplicationTermination: {
7888 shell.applicationManager.stopApplication(model.appId)
7989 }
Dash/DashApps.qml+1
@@ -44,6 +44,7 @@ GenericScopeView {
4444
4545 property var firstModel: mainStageApplicationsModel
4646 property var secondModel: sideStageApplicationModel
47+ property bool canEnableTerminationMode: scopeView.isCurrent
4748
4849 model: dummyVisibilityModifier
4950 filterRole: 0
Dash/GenericScopeView.qml+1
@@ -151,6 +151,7 @@ FocusScope {
151151 // TODO: the running apps grid doesn't support standard scope results model yet
152152 item.firstModel = Qt.binding(function() { return results.firstModel })
153153 item.secondModel = Qt.binding(function() { return results.secondModel })
154+ item.canEnableTerminationMode = Qt.binding(function() { return scopeView.isCurrent })
154155 } else {
155156 item.model = Qt.binding(function() { return results })
156157 }