Merge lp:~azzar1/unity/disable-menu-discovery-if-0 into lp:unity

Proposed by Andrea Azzarone on 2016-08-12
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-08-23
Approved revision: 4169
Merged at revision: 4180
Proposed branch: lp:~azzar1/unity/disable-menu-discovery-if-0
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
panel/PanelMenuView.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/disable-menu-discovery-if-0
Reviewer Review Type Date Requested Status
Unity Team 2016-08-12 Pending
Review via email: mp+302777@code.launchpad.net

Commit message

Disable menu discovery animation if MenusDiscoveryDuration is 0.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panel/PanelMenuView.cpp'
2--- panel/PanelMenuView.cpp 2015-12-16 15:12:05 +0000
3+++ panel/PanelMenuView.cpp 2016-08-12 09:15:22 +0000
4@@ -724,7 +724,7 @@
5
6 if (new_application_ && !is_inside_)
7 {
8- if (opacity() != 1.0f)
9+ if (opacity() != 1.0f && menu_manager_->discovery() > 0)
10 StartFadeIn(menu_manager_->discovery_fadein());
11 }
12 else