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

Client: Refactor window active state

Browse Source 
Let shell surface implementations decide if they manage activated state. Moves
the logic out of QWaylandDisplay.

Change-Id: I75c86df68a1a93f9b1d2bf378b6603215d0b0128
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2016-08-05 10:59:51 +02:00 committed by Johan Helsing
parent 1e36cce9fe
commit f70756c94d
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,12 +385,6 @@ void QWaylandDisplay::setLastInputDevice(QWaylandInputDevice *device, uint32_t s
mLastInputWindow = win; mLastInputWindow = win;
} }
bool QWaylandDisplay::shellManagesActiveState() const
{
//TODO: This should be part of a shell interface used by the shell protocol implementations
return mShellXdg;
}
void QWaylandDisplay::handleWindowActivated(QWaylandWindow *window) void QWaylandDisplay::handleWindowActivated(QWaylandWindow *window)
{ {
if (mActiveWindows.contains(window)) if (mActiveWindows.contains(window))
@ -414,7 +408,7 @@ void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevic
{ {
QWaylandWindow *keyboardFocus = inputDevice->keyboardFocus(); QWaylandWindow *keyboardFocus = inputDevice->keyboardFocus();
if (!shellManagesActiveState() && mLastKeyboardFocus != keyboardFocus) { if (!keyboardFocus->shellSurface()->shellManagesActiveState() && mLastKeyboardFocus != keyboardFocus) {
if (keyboardFocus) if (keyboardFocus)
handleWindowActivated(keyboardFocus); handleWindowActivated(keyboardFocus);
if (mLastKeyboardFocus) if (mLastKeyboardFocus)

1
src/plugins/platforms/wayland/qwaylanddisplay_p.h
View File

@ -169,7 +169,6 @@ public:
QWaylandWindow *lastInputWindow() const; QWaylandWindow *lastInputWindow() const;
void setLastInputDevice(QWaylandInputDevice *device, uint32_t serial, QWaylandWindow *window); void setLastInputDevice(QWaylandInputDevice *device, uint32_t serial, QWaylandWindow *window);
bool shellManagesActiveState() const;
void handleWindowActivated(QWaylandWindow *window); void handleWindowActivated(QWaylandWindow *window);
void handleWindowDeactivated(QWaylandWindow *window); void handleWindowDeactivated(QWaylandWindow *window);
void handleKeyboardFocusChanged(QWaylandInputDevice *inputDevice); void handleKeyboardFocusChanged(QWaylandInputDevice *inputDevice);

1
src/plugins/platforms/wayland/qwaylandshellsurface_p.h
View File

@ -85,6 +85,7 @@ public:
virtual void setContentOrientationMask(Qt::ScreenOrientations orientation) { Q_UNUSED(orientation) } virtual void setContentOrientationMask(Qt::ScreenOrientations orientation) { Q_UNUSED(orientation) }
virtual void sendProperty(const QString &name, const QVariant &value); virtual void sendProperty(const QString &name, const QVariant &value);
virtual bool shellManagesActiveState() const { return false; }
inline QWaylandWindow *window() { return m_window; } inline QWaylandWindow *window() { return m_window; }

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

@ -89,6 +89,8 @@ public:
void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE; void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
void sendProperty(const QString &name, const QVariant &value) Q_DECL_OVERRIDE; void sendProperty(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
bool shellManagesActiveState() const Q_DECL_OVERRIDE { return true; }
bool isFullscreen() const { return m_fullscreen; } bool isFullscreen() const { return m_fullscreen; }
bool isMaximized() const { return m_maximized; } bool isMaximized() const { return m_maximized; }