[plasma/kwin] src/scripting: scripting: Port away from QRectF
Vlad Zahorodnii <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 05a72ce63d50d64731f035eee49170b8854f8dfb by Vlad Zahorodnii.
Committed on 22/07/2026 at 06:51.
Pushed by vladz into branch 'master'.
scripting: Port away from QRectF
M +0 -1 src/scripting/tilemodel.h
M +9 -10 src/scripting/windowthumbnailitem.cpp
M +3 -1 src/scripting/windowthumbnailitem.h
M +5 -5 src/scripting/workspace_wrapper.cpp
M +7 -4 src/scripting/workspace_wrapper.h
https://invent.kde.org/plasma/kwin/-/commit/05a72ce63d50d64731f035eee49170b8854f8dfb
diff --git a/src/scripting/tilemodel.h b/src/scripting/tilemodel.h
index 37ef0ffd6f7..2a2a9706264 100644
--- a/src/scripting/tilemodel.h
+++ b/src/scripting/tilemodel.h
@@ -14,7 +14,6 @@
#include <QAbstractItemModel>
#include <QObject>
-#include <QRectF>
#include <QJsonValue>
diff --git a/src/scripting/windowthumbnailitem.cpp b/src/scripting/windowthumbnailitem.cpp
index 3e8d222901b..ee3ec441e24 100644
--- a/src/scripting/windowthumbnailitem.cpp
+++ b/src/scripting/windowthumbnailitem.cpp
@@ -115,7 +115,7 @@ void WindowThumbnailSource::update()
}
Q_ASSERT(m_view);
- const QRectF geometry = m_handle->visibleGeometry();
+ const RectF geometry = m_handle->visibleGeometry();
const qreal devicePixelRatio = m_view->devicePixelRatio();
const QSize textureSize = geometry.toAlignedRect().size() * devicePixelRatio;
@@ -394,24 +394,23 @@ void WindowThumbnailItem::updateImplicitSize()
}
setImplicitSize(frameSize.width(), frameSize.height());
}
-
-QRectF WindowThumbnailItem::paintedRect() const
+RectF WindowThumbnailItem::paintedRect() const
{
if (!m_client) {
- return QRectF();
+ return RectF();
}
- const QRectF visibleGeometry = m_client->visibleGeometry();
- const QRectF frameGeometry = m_client->frameGeometry();
+ const RectF visibleGeometry = m_client->visibleGeometry();
+ const RectF frameGeometry = m_client->frameGeometry();
const QSizeF scaled = QSizeF(frameGeometry.size()).scaled(boundingRect().size(), Qt::KeepAspectRatio);
const qreal xScale = scaled.width() / frameGeometry.width();
const qreal yScale = scaled.height() / frameGeometry.height();
- QRectF paintedRect(boundingRect().x() + (boundingRect().width() - scaled.width()) / 2,
- boundingRect().y() + (boundingRect().height() - scaled.height()) / 2,
- visibleGeometry.width() * xScale,
- visibleGeometry.height() * yScale);
+ RectF paintedRect(boundingRect().x() + (boundingRect().width() - scaled.width()) / 2,
+ boundingRect().y() + (boundingRect().height() - scaled.height()) / 2,
+ visibleGeometry.width() * xScale,
+ visibleGeometry.height() * yScale);
paintedRect.moveLeft(paintedRect.x() + (visibleGeometry.x() - frameGeometry.x()) * xScale);
paintedRect.moveTop(paintedRect.y() + (visibleGeometry.y() - frameGeometry.y()) * yScale);
diff --git a/src/scripting/windowthumbnailitem.h b/src/scripting/windowthumbnailitem.h
index 92cae369913..c94fb3a8e34 100644
--- a/src/scripting/windowthumbnailitem.h
+++ b/src/scripting/windowthumbnailitem.h
@@ -7,6 +7,8 @@
#pragma once
+#include "core/rect.h"
+
#include <QQuickItem>
#include <QUuid>
@@ -110,7 +112,7 @@ private Q_SLOTS:
void invalidateSceneGraph();
private:
- QRectF paintedRect() const;
+ RectF paintedRect() const;
void updateImplicitSize();
void updateSource();
void releaseOpenGlResources();
diff --git a/src/scripting/workspace_wrapper.cpp b/src/scripting/workspace_wrapper.cpp
index 27afaf8d07a..a14e8cc4d28 100644
--- a/src/scripting/workspace_wrapper.cpp
+++ b/src/scripting/workspace_wrapper.cpp
@@ -267,23 +267,23 @@ QSize WorkspaceWrapper::workspaceSize() const
return QSize(workspaceWidth(), workspaceHeight());
}
-QRectF WorkspaceWrapper::clientArea(ClientAreaOption option, const KWin::Window *c) const
+RectF WorkspaceWrapper::clientArea(ClientAreaOption option, const KWin::Window *c) const
{
if (!c) {
- return QRectF();
+ return RectF();
}
return Workspace::self()->clientArea(static_cast<clientAreaOption>(option), c);
}
-QRectF WorkspaceWrapper::clientArea(ClientAreaOption option, KWin::Window *c) const
+RectF WorkspaceWrapper::clientArea(ClientAreaOption option, KWin::Window *c) const
{
if (!c) {
- return QRectF();
+ return RectF();
}
return Workspace::self()->clientArea(static_cast<clientAreaOption>(option), c);
}
-QRectF WorkspaceWrapper::clientArea(ClientAreaOption option, LogicalOutput *output, VirtualDesktop *desktop) const
+RectF WorkspaceWrapper::clientArea(ClientAreaOption option, LogicalOutput *output, VirtualDesktop *desktop) const
{
if (!output) {
qCWarning(KWIN_SCRIPTING) << "clientArea needs a valid output:" << output << "argument";
diff --git a/src/scripting/workspace_wrapper.h b/src/scripting/workspace_wrapper.h
index c3aa9203633..584e1659162 100644
--- a/src/scripting/workspace_wrapper.h
+++ b/src/scripting/workspace_wrapper.h
@@ -10,7 +10,10 @@
#pragma once
-#include "effect/globals.h"
+#include "config-kwin.h"
+
+#include "core/rect.h"
+
#include <QObject>
#include <QQmlListProperty>
#include <QRect>
@@ -415,7 +418,7 @@ public:
*
* \a desktop The desktop for which the area should be considered, in general there should not be a difference
*/
- Q_SCRIPTABLE QRectF clientArea(ClientAreaOption option, KWin::LogicalOutput *output, KWin::VirtualDesktop *desktop) const;
+ Q_SCRIPTABLE KWin::RectF clientArea(ClientAreaOption option, KWin::LogicalOutput *output, KWin::VirtualDesktop *desktop) const;
/*!
* \qmlmethod rect Workspace::clientArea(enumeration option, Window client)
@@ -424,8 +427,8 @@ public:
*
* \a client The Client for which the area should be retrieved
*/
- Q_SCRIPTABLE QRectF clientArea(ClientAreaOption option, KWin::Window *client) const;
- Q_SCRIPTABLE QRectF clientArea(ClientAreaOption option, const KWin::Window *client) const;
+ Q_SCRIPTABLE KWin::RectF clientArea(ClientAreaOption option, KWin::Window *client) const;
+ Q_SCRIPTABLE KWin::RectF clientArea(ClientAreaOption option, const KWin::Window *client) const;
/*!
* \qmlmethod void Workspace::clientArea(int position, string name)