diff options
| author | David Edmundson <davidedmundson@kde.org> | 2019-04-11 03:58:06 +0100 |
|---|---|---|
| committer | David Edmundson <davidedmundson@kde.org> | 2019-04-11 12:51:52 +0000 |
| commit | 5ef85a13da557e81a598f9a867817dfcba25ef98 (patch) | |
| tree | c7c88685751c957b853304239f7067628a5a4d43 /src/client/qwaylandwindow_p.h | |
| parent | 0b10284a3589b37a9d639f3d1af4b1d641fbb6ab (diff) | |
Client: Avoid shadowing QPlatformWindow::windowGeometry
windowGeometry is an existing method in QPlatformWindow with an entirely
different meaning to the newly added
QWaylandWindow::windowGeometry.
This led to the existing call in resizeFromApplyConfigure calling the
wrong method.
Change-Id: Ib344cf09178e77e5b4d5427325d840346663ec9d
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index 8999682d9..7ab0ca74e 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -126,7 +126,7 @@ public: QMargins frameMargins() const override; QSize surfaceSize() const; - QRect windowGeometry() const; + QRect windowContentGeometry() const; static QWaylandWindow *fromWlSurface(::wl_surface *surface); |