Unity

Merge lp:~3v1n0/unity/switcher-terminates-spread into lp:unity

  1. switcher-terminates-spread
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3951
Proposed branch: lp:~3v1n0/unity/switcher-terminates-spread
Merge into: lp:unity
Prerequisite: lp:~3v1n0/unity/switcher-first-selection-mode
Diff against target: 53 lines (+4/-7)
4 files modified
plugins/unityshell/src/unityshell.cpp (+3/-0)
tests/test_spread_filter.cpp (+1/-0)
unity-shared/SpreadFilter.cpp (+0/-6)
unity-shared/SpreadFilter.h (+0/-1)
To merge this branch: bzr merge lp:~3v1n0/unity/switcher-terminates-spread
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Townsend Approve
Review via email: mp+255440@code.launchpad.net

Commit message

UnityScreen: terminate spread if active when initiating Switcher

Also avodon't make the SpreadFilter to unset the nux key-focus area on destruction.

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

FAILED: Continuous integration, rev:3921
http://jenkins.qa.ubuntu.com/job/unity-ci/1182/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/69/console

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

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

Works as expected now. We'll wait on what Jenkins has to say before top approving.

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

PASSED: Continuous integration, rev:3922
http://jenkins.qa.ubuntu.com/job/unity-ci/1183/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/70

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp 2015-04-08 12:29:51 +0000
+++ plugins/unityshell/src/unityshell.cpp 2015-04-08 12:29:51 +0000
@@ -2234,6 +2234,9 @@
2234 grab_index_ = screen->pushGrab(cursor, "unity-switcher");2234 grab_index_ = screen->pushGrab(cursor, "unity-switcher");
2235 }2235 }
22362236
2237 if (WM.IsScaleActive())
2238 WM.TerminateScale();
2239
2237 launcher_controller_->ClearTooltips();2240 launcher_controller_->ClearTooltips();
22382241
2239 /* Create a new keybinding for scroll buttons and current modifiers */2242 /* Create a new keybinding for scroll buttons and current modifiers */
22402243
=== modified file 'tests/test_spread_filter.cpp'
--- tests/test_spread_filter.cpp 2014-03-21 04:40:12 +0000
+++ tests/test_spread_filter.cpp 2015-04-08 12:29:51 +0000
@@ -23,6 +23,7 @@
23#include <NuxCore/AnimationController.h>23#include <NuxCore/AnimationController.h>
2424
25#include "SpreadFilter.h"25#include "SpreadFilter.h"
26#include "SearchBar.h"
26#include "DashStyle.h"27#include "DashStyle.h"
27#include "test_utils.h"28#include "test_utils.h"
2829
2930
=== modified file 'unity-shared/SpreadFilter.cpp'
--- unity-shared/SpreadFilter.cpp 2014-07-28 18:24:11 +0000
+++ unity-shared/SpreadFilter.cpp 2015-04-08 12:29:51 +0000
@@ -108,12 +108,6 @@
108 });108 });
109}109}
110110
111Filter::~Filter()
112{
113 nux::GetWindowCompositor().SetKeyFocusArea(nullptr);
114 nux::GetWindowThread()->RemoveObjectFromLayoutQueue(view_window_.GetPointer());
115}
116
117bool Filter::Visible() const111bool Filter::Visible() const
118{112{
119 return (view_window_->GetOpacity() != 0.0f);113 return (view_window_->GetOpacity() != 0.0f);
120114
=== modified file 'unity-shared/SpreadFilter.h'
--- unity-shared/SpreadFilter.h 2014-04-01 15:03:24 +0000
+++ unity-shared/SpreadFilter.h 2015-04-08 12:29:51 +0000
@@ -40,7 +40,6 @@
40 typedef std::shared_ptr<Filter> Ptr;40 typedef std::shared_ptr<Filter> Ptr;
4141
42 Filter();42 Filter();
43 virtual ~Filter();
4443
45 nux::RWProperty<std::string> text;44 nux::RWProperty<std::string> text;
4645