Merge lp:~aacid/unity-2d/unity-2d_launcher_autohide_bug into lp:unity-2d

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 927
Merged at revision: 927
Proposed branch: lp:~aacid/unity-2d/unity-2d_launcher_autohide_bug
Merge into: lp:unity-2d
Diff against target: 19 lines (+9/-0)
1 file modified
shell/common/visibilityBehaviors/AutoHideBehavior.qml (+9/-0)
To merge this branch: bzr merge lp:~aacid/unity-2d/unity-2d_launcher_autohide_bug
Reviewer Review Type Date Requested Status
Michał Sawicz Pending
Review via email: mp+93846@code.launchpad.net

Description of the change

Fix for bug regarding Auto Hide and moving the mouse to the launcher after it has been shown because of focus

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shell/common/visibilityBehaviors/AutoHideBehavior.qml'
2--- shell/common/visibilityBehaviors/AutoHideBehavior.qml 2012-02-08 16:18:21 +0000
3+++ shell/common/visibilityBehaviors/AutoHideBehavior.qml 2012-02-20 14:24:19 +0000
4@@ -46,6 +46,15 @@
5 }
6
7 Connections {
8+ target: (autoHide.target !== undefined) ? autoHide.target : null
9+ onContainsMouseChanged: {
10+ if (target.activeFocus) {
11+ shownRegardlessOfFocus = true
12+ }
13+ }
14+ }
15+
16+ Connections {
17 target: autoHide.target !== undefined ? autoHide.target : null
18 onOuterEdgeContainsMouseChanged: edgeHitTimer.running = target.outerEdgeContainsMouse
19 ignoreUnknownSignals: true

Subscribers

People subscribed via source and target branches