Merge lp:~brandontschaefer/unity/lp.1175666-fix2 into lp:unity

[Brandon Schaefer]

Correctly set back the filter scroll views state when leaving/entering the scope view.

Old branch:
https://code.launchpad.net/~brandontschaefer/unity/lp.1175666-fix/+merge/172921

So when the scope view is changing visibility we have 2 different states.

1) We are changing the scope view visibility to true. If this is the case, we need to check if the filter is expanded, if it is expanded we set the filter scroll view to true.

2) We are changing the scope view visibility to false. If so, we just set the filter scroll view to false.

So when we set the filter scroll view to false in step 2 and we re-enter the scope view we can now safely set the filter scroll views visibility back to its state before leaving.

This way the filter scroll view isn't being left visible while its not being rendered. This was causing the overlay scroll bars to think it was visible, which caused them to render at odd times.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3411
http://jenkins.qa.ubuntu.com/job/unity-ci/190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/78/console

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

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Code looks good, merges and compiles cleanly, and no funky scroll views:)

I also didn't see any weird regressions as seen in the first fix for this.

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2013-07-05 12:38:49 +0000
+++ dash/ScopeView.cpp	2013-07-05 23:03:27 +0000
@@ -224,6 +224,9 @@
 
   OnVisibleChanged.connect([&] (nux::Area* area, bool visible) {
     scroll_view_->SetVisible(visible);
+
+    if ((filters_expanded && visible) || !visible)
+      fscroll_view_->SetVisible(visible);
   });
 }