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

Merge "Merge remote-tracking branch 'origin/5.13' into dev"

Browse Source
This commit is contained in:
Qt Forward Merge Bot 2019-05-26 22:27:55 +02:00
commit 0899b4287b
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgdecorationv1.cpp
View File

@ -95,9 +95,15 @@ QWaylandXdgToplevelDecorationV1::mode QWaylandXdgToplevelDecorationV1::pending()
return m_pending; return m_pending;
} }
bool QWaylandXdgToplevelDecorationV1::isConfigured() const
{
return m_configured;
}
void QtWaylandClient::QWaylandXdgToplevelDecorationV1::zxdg_toplevel_decoration_v1_configure(uint32_t mode) void QtWaylandClient::QWaylandXdgToplevelDecorationV1::zxdg_toplevel_decoration_v1_configure(uint32_t mode)
{ {
m_pending = zxdg_toplevel_decoration_v1::mode(mode); m_pending = zxdg_toplevel_decoration_v1::mode(mode);
m_configured = true;
} }
} }

2
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgdecorationv1_p.h
View File

@ -80,6 +80,7 @@ public:
void requestMode(mode mode); void requestMode(mode mode);
void unsetMode(); void unsetMode();
mode pending() const; mode pending() const;
bool isConfigured() const;
protected: protected:
void zxdg_toplevel_decoration_v1_configure(uint32_t mode) override; void zxdg_toplevel_decoration_v1_configure(uint32_t mode) override;
@ -88,6 +89,7 @@ private:
mode m_pending = mode_client_side; mode m_pending = mode_client_side;
mode m_requested = mode_client_side; mode m_requested = mode_client_side;
bool m_modeSet = false; bool m_modeSet = false;
bool m_configured = false;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

3
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
View File

@ -112,7 +112,8 @@ void QWaylandXdgSurface::Toplevel::applyConfigure()
bool QWaylandXdgSurface::Toplevel::wantsDecorations() bool QWaylandXdgSurface::Toplevel::wantsDecorations()
{ {
if (m_decoration && m_decoration->pending() == QWaylandXdgToplevelDecorationV1::mode_server_side) if (m_decoration && (m_decoration->pending() == QWaylandXdgToplevelDecorationV1::mode_server_side
|| !m_decoration->isConfigured()))
return false; return false;
return !(m_pending.states & Qt::WindowFullScreen); return !(m_pending.states & Qt::WindowFullScreen);