← Back to branch summary

~ubuntu-branches/ubuntu/wily/unity/wily

~ubuntu-branches/ubuntu/wily/unity/wily

« back to all changes in this revision

Viewing changes to hud/HudView.cpp

Committer: Michal Hruby
Date: 2012-07-17 12:51:00 UTC
mfrom: (55.1863.159 unity)
mto: (55.2103.4 unity-annotated-icon)
mto: This revision was merged to the branch mainline in revision 747.
Revision ID: michal.mhr@gmail.com-20120717125100-oivb4hpvy38czfnj

Merge trunk

files added:
launcher/MockLauncherIcon.cpp

tests/data/no-icon.desktop

tests/test_launcher.cpp

files modified:
.bzrignore

AUTHORS

CMakeLists.txt

ChangeLog

UnityCore/Filter.h

UnityCore/GLibDBusProxy.cpp

UnityCore/GLibDBusProxy.h

UnityCore/GLibSignal-inl.h

UnityCore/GLibSignal.h

UnityCore/GLibSource.cpp

UnityCore/GLibSource.h

UnityCore/GLibWrapper-inl.h

UnityCore/GLibWrapper.h

dash/CMakeLists.txt

dash/DashView.cpp

hud/CMakeLists.txt

hud/HudView.cpp

launcher/BamfLauncherIcon.cpp

launcher/BamfLauncherIcon.h

launcher/CMakeLists.txt

launcher/DndData.cpp

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherIcon.cpp

launcher/LauncherModel.cpp

launcher/MockLauncherIcon.h

launcher/QuicklistView.cpp

launcher/QuicklistView.h

launcher/SwitcherController.cpp

manual-tests/Dash.txt

manual-tests/Launcher.txt

manual-tests/Panel.txt

manual-tests/Switcher.txt

manual-tests/WindowManagement.txt

panel/CMakeLists.txt

panel/PanelMenuView.cpp

panel/PanelView.cpp

panel/WindowButtons.cpp

plugins/unityshell/src/unitya11ytests.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

po/POTFILES.in

shortcuts/CMakeLists.txt

shortcuts/ShortcutView.cpp

tests/CMakeLists.txt

tests/autopilot/unity/emulators/hud.py

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/emulators/panel.py

tests/autopilot/unity/emulators/quicklist.py

tests/autopilot/unity/emulators/switcher.py

tests/autopilot/unity/tests/__init__.py

tests/autopilot/unity/tests/launcher/test_icon_behavior.py

tests/autopilot/unity/tests/launcher/test_keynav.py

tests/autopilot/unity/tests/launcher/test_reveal.py

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_quicklist.py

tests/autopilot/unity/tests/test_shortcut_hint.py

tests/autopilot/unity/tests/test_showdesktop.py

tests/autopilot/unity/tests/test_switcher.py

tests/test_bamflaunchericon.cpp

tests/test_filesystem_lenses.cpp

tests/test_glib_object.cpp

tests/test_glib_signals.cpp

tests/test_glib_source.cpp

tests/test_icon_loader.cpp

tests/test_lens.cpp

tests/test_main.cpp

unity-shared/CMakeLists.txt

unity-shared/FontSettings.cpp

unity-shared/IconLoader.cpp

unity-shared/IconLoader.h

unity-shared/PluginAdapterStandalone.cpp

unity-shared/TextureCache.cpp

unity-shared/TextureCache.h

unity-shared/UBusWrapper.cpp

unity-shared/UBusWrapper.h

unity-standalone/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

hud/HudView.cpp

565

565

unsigned long x11_key_code,

566

566

unsigned long special_keys_state)

567

567

{

568

// Only care about states of Alt, Ctrl, Super, Shift, not the lock keys

569

special_keys_state &= (nux::NUX_STATE_ALT | nux::NUX_STATE_CTRL |

570

nux::NUX_STATE_SUPER | nux::NUX_STATE_SHIFT);

571

568

572

nux::KeyNavDirection direction = nux::KEY_NAV_NONE;

569

573

switch (x11_key_code)

570

574

{

Older »