1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qt/5.6.2' into 5.6

Browse Source 
Change-Id: Ie6ec1ae90396619214cf1f29ae9595c5f1915e10
This commit is contained in:
Paul Olav Tvete 2016-08-26 16:22:11 +02:00
commit 47d6975894
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -399,13 +399,16 @@ void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevic
{ {
QWaylandWindow *keyboardFocus = inputDevice->keyboardFocus(); QWaylandWindow *keyboardFocus = inputDevice->keyboardFocus();
if (!keyboardFocus->shellSurface()->shellManagesActiveState() && mLastKeyboardFocus != keyboardFocus) { if (mLastKeyboardFocus == keyboardFocus)
if (keyboardFocus) return;
handleWindowActivated(keyboardFocus);
if (mLastKeyboardFocus) if (keyboardFocus && !keyboardFocus->shellManagesActiveState())
handleWindowDeactivated(mLastKeyboardFocus); handleWindowActivated(keyboardFocus);
}
mLastKeyboardFocus = inputDevice->keyboardFocus(); if (mLastKeyboardFocus && !mLastKeyboardFocus->shellManagesActiveState())
handleWindowDeactivated(mLastKeyboardFocus);
mLastKeyboardFocus = keyboardFocus;
} }
void QWaylandDisplay::handleWaylandSync() void QWaylandDisplay::handleWaylandSync()

5
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -500,6 +500,11 @@ QWaylandSubSurface *QWaylandWindow::subSurfaceWindow() const
return mSubSurfaceWindow; return mSubSurfaceWindow;
} }
bool QWaylandWindow::shellManagesActiveState() const
{
return mShellSurface && mShellSurface->shellManagesActiveState();
}
void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation) void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation)
{ {
if (mDisplay->compositorVersion() < 2) if (mDisplay->compositorVersion() < 2)

2
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -136,6 +136,8 @@ public:
QWaylandSubSurface *subSurfaceWindow() const; QWaylandSubSurface *subSurfaceWindow() const;
QWaylandScreen *screen() const { return mScreen; } QWaylandScreen *screen() const { return mScreen; }
bool shellManagesActiveState() const;
void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE; void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE;
void setOrientationMask(Qt::ScreenOrientations mask); void setOrientationMask(Qt::ScreenOrientations mask);