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

Merge remote-tracking branch 'origin/5.12' into 5.13

Browse Source 
Change-Id: I6d63f7390a3d26ce8c63c8e5de63b673d6831395
This commit is contained in:
Qt Forward Merge Bot 2019-03-16 03:04:44 +01:00
commit 5098f9f6e7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/wayland/qwaylandabstractdecoration.cpp
View File

@ -100,14 +100,19 @@ void QWaylandAbstractDecoration::setWaylandWindow(QWaylandWindow *window)
d->m_wayland_window = window; d->m_wayland_window = window;
} }
// \a size is without margins // Creates regions like this on the outside of a rectangle with inner size \a size
// -----
// | |
// -----
// I.e. the top and bottom extends into the corners
static QRegion marginsRegion(const QSize &size, const QMargins &margins) static QRegion marginsRegion(const QSize &size, const QMargins &margins)
{ {
QRegion r; QRegion r;
r += QRect(0, 0, size.width(), margins.top()); // top const int widthWithMargins = margins.left() + size.width() + margins.right();
r += QRect(0, size.height()+margins.top(), size.width(), margins.bottom()); //bottom r += QRect(0, 0, widthWithMargins, margins.top()); // top
r += QRect(0, 0, margins.left(), size.height()); //left r += QRect(0, size.height()+margins.top(), widthWithMargins, margins.bottom()); //bottom
r += QRect(size.width()+margins.left(), 0, margins.right(), size.height()); // right r += QRect(0, margins.top(), margins.left(), size.height()); //left
r += QRect(size.width()+margins.left(), margins.top(), margins.right(), size.height()); // right
return r; return r;
} }