Unity

Merge lp://staging/~townsend/unity/fix-lp1168019 into lp://staging/unity

  1. fix-lp1168019
  2. Merge into trunk
Proposed by Christopher Townsend
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3478
Proposed branch: lp://staging/~townsend/unity/fix-lp1168019
Merge into: lp://staging/unity
Diff against target: 101 lines (+36/-1)
4 files modified
dash/DashView.cpp (+9/-0)
tests/CMakeLists.txt (+2/-0)
tests/data/unity/scopes/commands.scope (+8/-0)
tests/test_dashview.cpp (+17/-1)
To merge this branch: bzr merge lp://staging/~townsend/unity/fix-lp1168019
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+182189@code.staging.launchpad.net

Commit message

Do not display the scope bar at the bottom when the Command "Lens" is opened as it's not really not a Lens/Scope.

Description of the change

= Issue =
The Command "Lens" is not really a lens and as such, the scope bar at the bottom should not be visible when the Command "Lens" is opened.

= Fix =
Add logic to detect when the command lens is opened and if so, set the scope bar to invisible.

= Test =
Add unit test to ensure that the scope bar is indeed invisible when the command lens is active.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3479
http://jenkins.qa.ubuntu.com/job/unity-ci/312/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/201/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/199/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/200/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/312/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/232/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/1773/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/188/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3480
http://jenkins.qa.ubuntu.com/job/unity-ci/315/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/204/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/202/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/203/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/315/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3481
http://jenkins.qa.ubuntu.com/job/unity-ci/318/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/207/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/206

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/318/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Finally figured out what was causing the Jenkins failures. I believe the amd64 ci failure last posted by jenkins is not caused by my MP. Globally approving this.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.