unity-2d

Merge lp:~aacid/unity-2d/unity-2d-shell_do_not_hide_launcher_on_alt_f1_esc into lp:~unity-2d-team/unity-2d/unity-2d-shell

  1. unity-2d-shell_do_not_hide_launcher_on_alt_f1_esc
  2. Merge into unity-2d-shell
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 929
Merged at revision: 929
Proposed branch: lp:~aacid/unity-2d/unity-2d-shell_do_not_hide_launcher_on_alt_f1_esc
Merge into: lp:~unity-2d-team/unity-2d/unity-2d-shell
Diff against target: 16 lines (+6/-1)
1 file modified
shell/launcher/IntelliHideBehavior.qml (+6/-1)
To merge this branch: bzr merge lp:~aacid/unity-2d/unity-2d-shell_do_not_hide_launcher_on_alt_f1_esc
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Review via email: mp+89947@code.launchpad.net

Description of the change

[launcher] Do not hide on Esc after Alt+F1 with overlapping window

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

There is a test for this at https://code.launchpad.net/~aacid/unity-2d/unity-2d_test_alt_f1_esc/+merge/89946

Revision history for this message
Michał Sawicz (saviq) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shell/launcher/IntelliHideBehavior.qml'
2--- shell/launcher/IntelliHideBehavior.qml 2012-01-19 14:45:49 +0000
3+++ shell/launcher/IntelliHideBehavior.qml 2012-01-24 17:06:53 +0000
4@@ -39,7 +39,12 @@
5
6 Connections {
7 target: (intellihide.target !== undefined) ? intellihide.target : null
8- onContainsMouseChanged: mouseLeaveTimer.running = !target.containsMouse
9+ onContainsMouseChanged: {
10+ if (shown && target.containsMouse) {
11+ shownBecauseOfMousePosition = true
12+ }
13+ mouseLeaveTimer.running = !target.containsMouse
14+ }
15 ignoreUnknownSignals: true
16 }
17

Subscribers

People subscribed via source and target branches