Unity

Merge lp:~townsend/unity/fix-hud-exit-always-on-top into lp:unity

  1. fix-hud-exit-always-on-top
  2. Merge into trunk
Proposed by Christopher Townsend
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3960
Proposed branch: lp:~townsend/unity/fix-hud-exit-always-on-top
Merge into: lp:unity
Diff against target: 12 lines (+2/-0)
1 file modified
hud/HudController.cpp (+2/-0)
To merge this branch: bzr merge lp:~townsend/unity/fix-hud-exit-always-on-top
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+256714@code.launchpad.net

Commit message

Save the active window when showing the Hud so the correct window is focused when hiding the Hud. Fixes issue when "Always on Top" windows are present.

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

PASSED: Continuous integration, rev:3953
http://jenkins.qa.ubuntu.com/job/unity-ci/1191/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/78

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

review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

For the same reason (I think), if you open the dash and then you close it, the focus is restored to the Always on Top window.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hud/HudController.cpp'
2--- hud/HudController.cpp 2015-03-12 20:48:00 +0000
3+++ hud/HudController.cpp 2015-04-17 20:35:50 +0000
4@@ -372,6 +372,8 @@
5 focused_app_icon_ = PKGDATADIR "/launcher_bfb.png";
6 }
7
8+ wm.SaveInputFocus();
9+
10 LOG_DEBUG(logger) << "Taking application icon: " << focused_app_icon_;
11 SetIcon(focused_app_icon_);
12 FocusWindow();