diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-11-04 10:32:01 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-11-10 15:32:07 +0000 |
| commit | 70740da8978cb87b269fcaa73d71595c3c396545 (patch) | |
| tree | 3429028a9e0786a5766039b971a74005b815bb0e /src/client/qwaylanddisplay.cpp | |
| parent | c88b5f632c767bee17c8b8df60af3d11724b2e5b (diff) | |
Remove QWaylandWindow::shellManagesActiveState
If m_shellSurface was deleted, there was no way for QWaylandDisplay to know
whether the shell handled window deactivation or not.
The shell integration now always handles the window active state. The default
implementation of QWaylandShellIntegration will make a window active on
keyboard focus.
Change-Id: I80cfce9976b1d3c57094fdd8980c9110b873f239
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 5f2c4e2ea..de38e3f25 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -419,11 +419,7 @@ void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevic if (mLastKeyboardFocus == keyboardFocus) return; - if (keyboardFocus && !keyboardFocus->shellManagesActiveState()) - handleWindowActivated(keyboardFocus); - - if (mLastKeyboardFocus && !mLastKeyboardFocus->shellManagesActiveState()) - handleWindowDeactivated(mLastKeyboardFocus); + mWaylandIntegration->mShellIntegration->handleKeyboardFocusChanged(keyboardFocus, mLastKeyboardFocus); mLastKeyboardFocus = keyboardFocus; } |