unity-2d

Merge lp:~aacid/unity-2d/unity-2d-shell_alt_f2_esc_alt_f2 into lp:~unity-2d-team/unity-2d/unity-2d-shell

  1. unity-2d-shell_alt_f2_esc_alt_f2
  2. Merge into unity-2d-shell
Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 956
Merge reported by: Albert Astals Cid
Merged at revision: not available
Proposed branch: lp:~aacid/unity-2d/unity-2d-shell_alt_f2_esc_alt_f2
Merge into: lp:~unity-2d-team/unity-2d/unity-2d-shell
Diff against target: 12 lines (+1/-1)
1 file modified
shell/dash/Dash.qml (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity-2d/unity-2d-shell_alt_f2_esc_alt_f2
Reviewer Review Type Date Requested Status
Gerry Boland Pending
Review via email: mp+91659@code.launchpad.net

Description of the change

[dash] Make sure we are shown before deciding not to show us

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

There is a test for this at https://code.launchpad.net/~aacid/unity-2d/unity-2d_test_alt_f2_esc_alt_f2/+merge/91660

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shell/dash/Dash.qml'
2--- shell/dash/Dash.qml 2012-02-06 12:07:47 +0000
3+++ shell/dash/Dash.qml 2012-02-06 14:41:32 +0000
4@@ -119,7 +119,7 @@
5 return
6 }
7
8- if (lensId == declarativeView.activeLens) {
9+ if (lensId == declarativeView.activeLens && dash.active) {
10 /* we don't need to activate the lens, just show its UI */
11 buildLensPage(lens)
12 return

Subscribers

People subscribed via source and target branches