Unity

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

  1. lp.1190798-fix
  2. Merge into trunk
Proposed by Brandon Schaefer
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3373
Proposed branch: lp:~brandontschaefer/unity/lp.1190798-fix
Merge into: lp:unity
Diff against target: 33 lines (+2/-3)
2 files modified
launcher/SwitcherController.cpp (+0/-1)
tests/test_switcher_controller.cpp (+2/-2)
To merge this branch: bzr merge lp:~brandontschaefer/unity/lp.1190798-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+169484@code.launchpad.net

Commit message

Fixes the use of Alt+` and Right arrow when in detail mode. Now it goes to the next window instead of closing detail mode.

Description of the change

When multiple windows of the same type are open, and you press Alt+`, you can now use the RIGHT arrow right away to move to the next window.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

It works fine, I don't see regressions around... So approved!

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/92/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/21

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

Hmm strange internal compiler error? Lets try this again...

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

PASSED: Continuous integration, rev:3372
http://jenkins.qa.ubuntu.com/job/unity-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/21

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/SwitcherController.cpp'
2--- launcher/SwitcherController.cpp 2013-05-17 22:53:57 +0000
3+++ launcher/SwitcherController.cpp 2013-06-14 16:20:40 +0000
4@@ -554,7 +554,6 @@
5 view_->animate = animate;
6
7 SetDetail(true);
8- obj_->detail_mode_ = DetailMode::TAB_NEXT_TILE;
9
10 if (!view_->animate())
11 {
12
13=== modified file 'tests/test_switcher_controller.cpp'
14--- tests/test_switcher_controller.cpp 2013-05-17 22:02:43 +0000
15+++ tests/test_switcher_controller.cpp 2013-06-14 16:20:40 +0000
16@@ -53,7 +53,7 @@
17
18 auto const& view = controller_->GetView();
19 auto const& model = view->GetModel();
20- EXPECT_EQ(controller_->detail_mode(), DetailMode::TAB_NEXT_TILE);
21+ EXPECT_EQ(controller_->detail_mode(), DetailMode::TAB_NEXT_WINDOW);
22 EXPECT_FALSE(view->animate());
23 EXPECT_TRUE(model->detail_selection());
24
25@@ -72,7 +72,7 @@
26
27 auto const& view = controller_->GetView();
28 auto const& model = view->GetModel();
29- EXPECT_EQ(controller_->detail_mode(), DetailMode::TAB_NEXT_TILE);
30+ EXPECT_EQ(controller_->detail_mode(), DetailMode::TAB_NEXT_WINDOW);
31 EXPECT_FALSE(view->animate());
32 EXPECT_FALSE(model->detail_selection());
33 }