summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-09-02 15:02:23 +0200
committerGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-09-03 07:50:03 +0000
commit3e35b84cf868ac954a4ebedf127d0a448e71900d (patch)
tree476c1dbca625b2f0e13b23636ad19cdd3590509b
parent6169341cbbeebdd6deed7c012b2ba79e1f6d95ff (diff)
Fix updating the keymap when no key is pressed
Change-Id: I55961a32a17dbf35b380f8a4b75433a6b694dd4a Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-rw-r--r--src/compositor/wayland_wrapper/qwlkeyboard.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compositor/wayland_wrapper/qwlkeyboard.cpp b/src/compositor/wayland_wrapper/qwlkeyboard.cpp
index 060965663..3d0af6aaf 100644
--- a/src/compositor/wayland_wrapper/qwlkeyboard.cpp
+++ b/src/compositor/wayland_wrapper/qwlkeyboard.cpp
@@ -146,14 +146,13 @@ void Keyboard::setFocus(Surface* surface)
void Keyboard::setKeymap(const QWaylandKeymap &keymap)
{
m_keymap = keymap;
+ m_pendingKeymap = true;
// If there is no key currently pressed, update right away the keymap
// Otherwise, delay the update when keys are released
// see http://lists.freedesktop.org/archives/wayland-devel/2013-October/011395.html
if (m_keys.isEmpty()) {
updateKeymap();
- } else {
- m_pendingKeymap = true;
}
}