Unity 8

Merge lp:~unity-api-team/unity8/scopes-active-depends-on-screen-rtm into lp:unity8/rtm-14.09

  1. scopes-active-depends-on-screen-rtm
  2. Merge into rtm-14.09
Proposed by Pete Woods on 2015-02-23
Status: Merged
Approved by: Ricardo Mendoza on 2015-02-27
Approved revision: 1418
Merged at revision: 1420
Proposed branch: lp:~unity-api-team/unity8/scopes-active-depends-on-screen-rtm
Merge into: lp:unity8/rtm-14.09
Diff against target: 20 lines (+2/-1)
1 file modified
qml/Dash/GenericScopeView.qml (+2/-1)
To merge this branch: bzr merge lp:~unity-api-team/unity8/scopes-active-depends-on-screen-rtm
Reviewer Review Type Date Requested Status
Ricardo Mendoza (community) 2015-02-23 Approve on 2015-02-27
Review via email: mp+250606@code.launchpad.net

Commit Message

Only set scopes active when the screen is on

Description of the Change

Only set scopes active when the screen is on

To post a comment you must log in.
Ricardo Mendoza (ricmm) wrote :

LGTM and works fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/GenericScopeView.qml'
2--- qml/Dash/GenericScopeView.qml 2015-01-13 15:14:33 +0000
3+++ qml/Dash/GenericScopeView.qml 2015-02-23 11:36:16 +0000
4@@ -19,6 +19,7 @@
5 import Utils 0.1
6 import Unity 0.2
7 import Dash 0.1
8+import Powerd 0.1
9 import "../Components"
10 import "../Components/ListItems" as ListItems
11
12@@ -104,7 +105,7 @@
13 Binding {
14 target: scope
15 property: "isActive"
16- value: isCurrent && !subPageLoader.open
17+ value: isCurrent && !subPageLoader.open && (Powerd.status === Powerd.On)
18 }
19
20 SortFilterProxyModel {

Subscribers

People subscribed via source and target branches

to all changes: