Merge lp:~brandontschaefer/unity/lp.1201631-fix into lp:unity

[Brandon Schaefer]

Don't make the ScopeView/DashView/ScrollView Visible on start up (bool wise, causing things to think its ok to render)

The problem is, on start up the home scope is being set to active. Which cause the DashView/ScopeView/ScrollView to all get set to Visible. If the scroll view is visible the Overlay Scroll bar thinks its ok to draw, because it thinks its being rendered... This is not the case.

** Possible regression **

The commit on the code being removed mentioned it fixed dash focus on first start. After testing, I still get focus on first start, but would love someone else to test it out!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3430
http://jenkins.qa.ubuntu.com/job/unity-ci/256/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/144

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

The overlay scrollbar is gone and upon login and opening the Dash, the Dash still has focus and accepts input.

LGTM. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-07-01 21:19:33 +0000
+++ dash/DashView.cpp	2013-07-18 20:10:36 +0000
@@ -1252,9 +1252,6 @@
     }
     preview_state_machine_.ActivatePreview(model); // this does not immediately display a preview - we now wait.
   });
-
-  if (!active_scope_view_)
-    scope_bar_->Activate(scope->id);
 }
 
 void DashView::OnScopeBarActivated(std::string const& id)