summaryrefslogtreecommitdiffstats
path: root/src/compositor/wayland_wrapper/qwlextendedsurface.cpp
diff options
context:
space:
mode:
authorGiulio Camuffo <giulio.camuffo@jollamobile.com>2014-06-09 22:52:29 +0300
committerPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2014-07-31 19:06:41 +0200
commitc18c3bee1e0bc6a570bff703ab5c47ce8cb90c91 (patch)
treeb4e79cdb68b7ecdb8093d98598b6f308db823d10 /src/compositor/wayland_wrapper/qwlextendedsurface.cpp
parent00d7933816d37f5e7bb8d61624c4d4ca38bb014f (diff)
Use wl_surface.set_buffer_transform to signal surface rotation
Drop the custom request in the surface extension, and use the wayland core mechanism. Change-Id: I580f56c90bcd3b2c5a6da08d1a033b10790ac330 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlextendedsurface.cpp')
-rw-r--r--src/compositor/wayland_wrapper/qwlextendedsurface.cpp26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/compositor/wayland_wrapper/qwlextendedsurface.cpp b/src/compositor/wayland_wrapper/qwlextendedsurface.cpp
index f8dea98d5..d4dfbaefd 100644
--- a/src/compositor/wayland_wrapper/qwlextendedsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlextendedsurface.cpp
@@ -64,7 +64,6 @@ ExtendedSurface::ExtendedSurface(struct wl_client *client, uint32_t id, Surface
: QWaylandSurfaceInterface(surface->waylandSurface())
, QtWaylandServer::qt_extended_surface(client,id)
, m_surface(surface)
- , m_contentOrientation(Qt::PrimaryOrientation)
, m_windowFlags(0)
, m_visibility(QWindow::Hidden)
{
@@ -126,36 +125,11 @@ void ExtendedSurface::extended_surface_update_generic_property(Resource *resourc
setWindowProperty(name,variantValue,false);
}
-static Qt::ScreenOrientation screenOrientationFromWaylandOrientation(int32_t orientation)
-{
- switch (orientation) {
- case QT_EXTENDED_SURFACE_ORIENTATION_PORTRAITORIENTATION: return Qt::PortraitOrientation;
- case QT_EXTENDED_SURFACE_ORIENTATION_INVERTEDPORTRAITORIENTATION: return Qt::InvertedPortraitOrientation;
- case QT_EXTENDED_SURFACE_ORIENTATION_LANDSCAPEORIENTATION: return Qt::LandscapeOrientation;
- case QT_EXTENDED_SURFACE_ORIENTATION_INVERTEDLANDSCAPEORIENTATION: return Qt::InvertedLandscapeOrientation;
- default: return Qt::PrimaryOrientation;
- }
-}
-
-Qt::ScreenOrientation ExtendedSurface::contentOrientation() const
-{
- return m_contentOrientation;
-}
-
Qt::ScreenOrientations ExtendedSurface::contentOrientationMask() const
{
return m_contentOrientationMask;
}
-void ExtendedSurface::extended_surface_set_content_orientation(Resource *resource, int32_t orientation)
-{
- Q_UNUSED(resource);
- Qt::ScreenOrientation oldOrientation = m_contentOrientation;
- m_contentOrientation = screenOrientationFromWaylandOrientation(orientation);
- if (m_contentOrientation != oldOrientation)
- emit m_surface->waylandSurface()->contentOrientationChanged();
-}
-
void ExtendedSurface::extended_surface_set_content_orientation_mask(Resource *resource, int32_t orientation)
{
Q_UNUSED(resource);