summaryrefslogtreecommitdiffstats
path: root/src/compositor/extensions
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-05-20 09:59:56 +0200
committerJohan Helsing <johan.helsing@qt.io>2016-05-31 13:12:44 +0000
commit4427c867543c6a970efd5a5ad7d52ee715c11e88 (patch)
treecadfcc8789d33125c18fd5b3c67ef0b8d6ec04e4 /src/compositor/extensions
parent5dd65d75bef5d07d8b29b3270f3f1410a921c073 (diff)
Rename xdg surface request<state> methods send<state>
It could be confusing to have methods that cause Wayland events to be named request*. Change-Id: I6567f9e8fd9370e574516e97cd49858e2bf34829 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'src/compositor/extensions')
-rw-r--r--src/compositor/extensions/qwaylandxdgshell.cpp8
-rw-r--r--src/compositor/extensions/qwaylandxdgshell.h8
-rw-r--r--src/compositor/extensions/qwaylandxdgshellintegration.cpp8
3 files changed, 12 insertions, 12 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index dfc68e254..ad3a1fc90 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -867,7 +867,7 @@ void QWaylandXdgSurface::sendClose()
d->send_close();
}
-uint QWaylandXdgSurface::requestMaximized(const QSize &size)
+uint QWaylandXdgSurface::sendMaximized(const QSize &size)
{
Q_D(QWaylandXdgSurface);
QWaylandXdgSurfacePrivate::ConfigureEvent conf = d->lastSentConfigure();
@@ -880,7 +880,7 @@ uint QWaylandXdgSurface::requestMaximized(const QSize &size)
return sendConfigure(size, conf.states);
}
-uint QWaylandXdgSurface::requestUnMaximized(const QSize &size)
+uint QWaylandXdgSurface::sendUnMaximized(const QSize &size)
{
Q_D(QWaylandXdgSurface);
QWaylandXdgSurfacePrivate::ConfigureEvent conf = d->lastSentConfigure();
@@ -892,7 +892,7 @@ uint QWaylandXdgSurface::requestUnMaximized(const QSize &size)
return sendConfigure(size, conf.states);
}
-uint QWaylandXdgSurface::requestFullscreen(const QSize &size)
+uint QWaylandXdgSurface::sendFullscreen(const QSize &size)
{
Q_D(QWaylandXdgSurface);
QWaylandXdgSurfacePrivate::ConfigureEvent conf = d->lastSentConfigure();
@@ -905,7 +905,7 @@ uint QWaylandXdgSurface::requestFullscreen(const QSize &size)
return sendConfigure(size, conf.states);
}
-uint QWaylandXdgSurface::requestResizing(const QSize &maxSize)
+uint QWaylandXdgSurface::sendResizing(const QSize &maxSize)
{
Q_D(QWaylandXdgSurface);
QWaylandXdgSurfacePrivate::ConfigureEvent conf = d->lastSentConfigure();
diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h
index c01726ac6..7f52ecb82 100644
--- a/src/compositor/extensions/qwaylandxdgshell.h
+++ b/src/compositor/extensions/qwaylandxdgshell.h
@@ -154,10 +154,10 @@ public:
Q_INVOKABLE uint sendConfigure(const QSize &size, const QVector<State> &states);
Q_INVOKABLE void sendClose();
- Q_INVOKABLE uint requestMaximized(const QSize &size);
- Q_INVOKABLE uint requestUnMaximized(const QSize &size = QSize(0, 0));
- Q_INVOKABLE uint requestFullscreen(const QSize &size);
- Q_INVOKABLE uint requestResizing(const QSize &maxSize);
+ Q_INVOKABLE uint sendMaximized(const QSize &size);
+ Q_INVOKABLE uint sendUnMaximized(const QSize &size = QSize(0, 0));
+ Q_INVOKABLE uint sendFullscreen(const QSize &size);
+ Q_INVOKABLE uint sendResizing(const QSize &maxSize);
QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) Q_DECL_OVERRIDE;
diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
index f77f69273..b0ba00b16 100644
--- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
@@ -73,7 +73,7 @@ bool XdgShellIntegration::mouseMoveEvent(QMouseEvent *event)
float scaleFactor = m_item->view()->output()->scaleFactor();
QPointF delta = (event->windowPos() - resizeState.initialMousePos) / scaleFactor;
QSize newSize = m_xdgSurface->sizeForResize(resizeState.initialWindowSize, delta, resizeState.resizeEdges);
- m_xdgSurface->requestResizing(newSize);
+ m_xdgSurface->sendResizing(newSize);
} else if (grabberState == GrabberState::Move) {
Q_ASSERT(moveState.inputDevice == m_item->compositor()->inputDeviceFor(event));
QQuickItem *moveItem = m_item->moveItem();
@@ -96,7 +96,7 @@ bool XdgShellIntegration::mouseReleaseEvent(QMouseEvent *event)
float scaleFactor = m_item->view()->output()->scaleFactor();
QPointF delta = (event->windowPos() - resizeState.initialMousePos) / scaleFactor;
QSize newSize = m_xdgSurface->sizeForResize(resizeState.initialWindowSize, delta, resizeState.resizeEdges);
- m_xdgSurface->requestUnMaximized(newSize);
+ m_xdgSurface->sendUnMaximized(newSize);
grabberState = GrabberState::Default;
return true;
} else if (grabberState == GrabberState::Move) {
@@ -130,12 +130,12 @@ void XdgShellIntegration::handleSetMaximized()
maximizeState.initialPosition = m_item->position();
QWaylandOutput *output = m_item->compositor()->outputs().first();
- m_xdgSurface->requestMaximized(output->geometry().size() / output->scaleFactor());
+ m_xdgSurface->sendMaximized(output->geometry().size() / output->scaleFactor());
}
void XdgShellIntegration::handleUnsetMaximized()
{
- m_xdgSurface->requestUnMaximized(maximizeState.initialWindowSize);
+ m_xdgSurface->sendUnMaximized(maximizeState.initialWindowSize);
}
void XdgShellIntegration::handleMaximizedChanged()