diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-07-31 18:39:43 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-07-31 18:39:43 +0000 |
| commit | 832aed2ecd137aa3b9fb48e0c47ac519ba65ed1b (patch) | |
| tree | 24f2503188446613961a29825115bb1585b72f1b /plugins | |
| parent | ca9ca5dfe0abae718e45d8b30cb891e723365b74 (diff) | |
| parent | 0fd80f685d38d80e073cf8380bfc80e9b31013ba (diff) | |
This has a "soft" dependency on lp:~3v1n0/nux/horizontal-scroll-delta/+merge/227070, this means that this code would just work as it used to do (except for the SwitcerView fix) if that nux branch is not used, while it will support correctly horizontal scroll events when both the branches are used. Fixes: 1342208, 1342731
Approved by: Christopher Townsend, PS Jenkins bot (bzr r3850)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 41115b13a..16ca2e17c 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -3824,7 +3824,7 @@ void UnityScreen::OnScreenLocked() // We notify that super/alt have been released, to avoid to leave unity in inconsistent state CompOption::Vector options(8); options[7].setName("time", CompOption::TypeInt); - options[7].value().set((int) screen->getCurrentTime()); + options[7].value().set<int>(screen->getCurrentTime()); showLauncherKeyTerminate(&optionGetShowLauncher(), CompAction::StateTermKey, options); showMenuBarTerminate(&optionGetShowMenuBar(), CompAction::StateTermKey, options); |