mirror of
https://invent.kde.org/plasma/layer-shell-qt.git
synced 2026-02-01 19:30:13 -05:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 211decbae8 | |||
| 60b7d27ae0 | |||
| 3dacd70398 | |||
| 94ac4be08f | |||
| df03deab5c | |||
| 44fe89b1b6 | |||
| 58f549d136 | |||
| 9ddf87a444 | |||
| b9e1260949 | |||
| cb79d3f60a | |||
| 2b8544f5a0 | |||
| e4b5bdbf1b | |||
| ebd64dd395 | |||
| ca0ac57fb4 | |||
| d085a88c81 | |||
| 5e57a060c6 | |||
| d436a779d7 | |||
| f599e829ad | |||
| 397398dfd8 | |||
| 7a074a3684 |
@ -4,13 +4,13 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
project(layershellqt)
|
project(layershellqt)
|
||||||
set(PROJECT_VERSION "6.3.90")
|
set(PROJECT_VERSION "6.5.91")
|
||||||
set(PROJECT_VERSION_MAJOR 6)
|
set(PROJECT_VERSION_MAJOR 6)
|
||||||
|
|
||||||
set(CMAKE_C_STANDARD 99)
|
set(CMAKE_C_STANDARD 99)
|
||||||
|
|
||||||
set(QT_MIN_VERSION "6.8.0")
|
set(QT_MIN_VERSION "6.10.0")
|
||||||
set(KF6_MIN_VERSION "6.14.0")
|
set(KF6_MIN_VERSION "6.22.0")
|
||||||
set(KDE_COMPILERSETTINGS_LEVEL "5.82")
|
set(KDE_COMPILERSETTINGS_LEVEL "5.82")
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
@ -32,6 +32,7 @@ include(KDEClangFormat)
|
|||||||
include(ECMQtDeclareLoggingCategory)
|
include(ECMQtDeclareLoggingCategory)
|
||||||
include(ECMQmlModule)
|
include(ECMQmlModule)
|
||||||
include(KDEGitCommitHooks)
|
include(KDEGitCommitHooks)
|
||||||
|
include(ECMGenerateExportHeader)
|
||||||
|
|
||||||
find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
|
find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
|
||||||
|
|
||||||
|
|||||||
@ -5,6 +5,8 @@ remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS)
|
|||||||
|
|
||||||
add_library(LayerShellQtInterface)
|
add_library(LayerShellQtInterface)
|
||||||
|
|
||||||
|
qt6_extract_metatypes(LayerShellQtInterface)
|
||||||
|
|
||||||
if (Qt6_VERSION VERSION_GREATER_EQUAL "6.8.0")
|
if (Qt6_VERSION VERSION_GREATER_EQUAL "6.8.0")
|
||||||
set(private_code_option "PRIVATE_CODE")
|
set(private_code_option "PRIVATE_CODE")
|
||||||
endif()
|
endif()
|
||||||
@ -62,10 +64,12 @@ ecm_generate_headers(LayerShellQt_HEADERS
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
generate_export_header(LayerShellQtInterface
|
ecm_generate_export_header(LayerShellQtInterface
|
||||||
BASE_NAME LayerShellQtInterface
|
BASE_NAME LayerShellQtInterface
|
||||||
EXPORT_MACRO_NAME LAYERSHELLQT_EXPORT
|
EXPORT_MACRO_NAME LAYERSHELLQT_EXPORT
|
||||||
EXPORT_FILE_NAME LayerShellQt/layershellqt_export.h
|
EXPORT_FILE_NAME LayerShellQt/layershellqt_export.h
|
||||||
|
VERSION ${LAYERSHELLQT_VERSION}
|
||||||
|
DEPRECATION_VERSIONS 6.6
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS layer-shell
|
install(TARGETS layer-shell
|
||||||
|
|||||||
@ -4,7 +4,8 @@
|
|||||||
ecm_add_qml_module(LayerShellQtQml
|
ecm_add_qml_module(LayerShellQtQml
|
||||||
URI "org.kde.layershell"
|
URI "org.kde.layershell"
|
||||||
VERSION 1.0
|
VERSION 1.0
|
||||||
SOURCES layershellqtplugin.cpp)
|
SOURCES types.h
|
||||||
|
GENERATE_PLUGIN_SOURCE)
|
||||||
target_link_libraries(LayerShellQtQml PRIVATE Qt::Qml LayerShellQtInterface)
|
target_link_libraries(LayerShellQtQml PRIVATE Qt::Qml LayerShellQtInterface)
|
||||||
|
|
||||||
ecm_finalize_qml_module(LayerShellQtQml DESTINATION ${KDE_INSTALL_QMLDIR})
|
ecm_finalize_qml_module(LayerShellQtQml DESTINATION ${KDE_INSTALL_QMLDIR})
|
||||||
|
|||||||
@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
* SPDX-FileCopyrightText: 2023 Aleix Pol Gonzalez <aleix.pol_gonzalez@mercedes-benz.com>
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "../interfaces/window.h"
|
|
||||||
#include <QQmlExtensionPlugin>
|
|
||||||
#include <qqml.h>
|
|
||||||
|
|
||||||
QML_DECLARE_TYPEINFO(LayerShellQt::Window, QML_HAS_ATTACHED_PROPERTIES)
|
|
||||||
|
|
||||||
class ExtQMargins
|
|
||||||
{
|
|
||||||
QMargins m_margins;
|
|
||||||
Q_GADGET
|
|
||||||
Q_PROPERTY(int left READ left WRITE setLeft FINAL)
|
|
||||||
Q_PROPERTY(int right READ right WRITE setRight FINAL)
|
|
||||||
Q_PROPERTY(int top READ top WRITE setTop FINAL)
|
|
||||||
Q_PROPERTY(int bottom READ bottom WRITE setBottom FINAL)
|
|
||||||
QML_FOREIGN(QMargins)
|
|
||||||
QML_EXTENDED(ExtQMargins)
|
|
||||||
public:
|
|
||||||
ExtQMargins(const QMargins &margins);
|
|
||||||
int left() const { return m_margins.left(); }
|
|
||||||
void setLeft(int left) { m_margins.setLeft(left); }
|
|
||||||
|
|
||||||
int right() const { return m_margins.right(); }
|
|
||||||
void setRight(int right) { m_margins.setRight(right); }
|
|
||||||
|
|
||||||
int top() const { return m_margins.top(); }
|
|
||||||
void setTop(int top) { m_margins.setTop(top); }
|
|
||||||
|
|
||||||
int bottom() const { return m_margins.bottom(); }
|
|
||||||
void setBottom(int bottom) { m_margins.setBottom(bottom); }
|
|
||||||
};
|
|
||||||
|
|
||||||
class Plugin : public QQmlExtensionPlugin
|
|
||||||
{
|
|
||||||
Q_PLUGIN_METADATA(IID "org.kde.layershellqt")
|
|
||||||
Q_OBJECT
|
|
||||||
public:
|
|
||||||
void registerTypes(const char *uri) override
|
|
||||||
{
|
|
||||||
Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.layershell"));
|
|
||||||
qmlRegisterType<LayerShellQt::Window>(uri, 1, 0, "Window");
|
|
||||||
qmlRegisterExtendedUncreatableType<QMargins, ExtQMargins>(uri, 1, 0, "ExtQMargins", QStringLiteral("Only created from C++"));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
#include "layershellqtplugin.moc"
|
|
||||||
19
src/declarative/types.h
Normal file
19
src/declarative/types.h
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: 2023 Aleix Pol Gonzalez <aleix.pol_gonzalez@mercedes-benz.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "../interfaces/window.h"
|
||||||
|
#include <qqml.h>
|
||||||
|
|
||||||
|
QML_DECLARE_TYPEINFO(LayerShellQt::Window, QML_HAS_ATTACHED_PROPERTIES)
|
||||||
|
|
||||||
|
class WindowForeign
|
||||||
|
{
|
||||||
|
Q_GADGET
|
||||||
|
QML_NAMED_ELEMENT(Window)
|
||||||
|
QML_FOREIGN(LayerShellQt::Window)
|
||||||
|
QML_UNCREATABLE("")
|
||||||
|
QML_ATTACHED(LayerShellQt::Window)
|
||||||
|
};
|
||||||
@ -5,6 +5,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "shell.h"
|
#include "shell.h"
|
||||||
|
|
||||||
|
#if LAYERSHELLQTINTERFACE_BUILD_DEPRECATED_SINCE(6, 6)
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <layershellqt_logging.h>
|
#include <layershellqt_logging.h>
|
||||||
#include <qglobal.h>
|
#include <qglobal.h>
|
||||||
@ -18,3 +21,4 @@ void Shell::useLayerShell()
|
|||||||
qCDebug(LAYERSHELLQT) << "Unable to set QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
|
qCDebug(LAYERSHELLQT) << "Unable to set QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|||||||
@ -8,7 +8,9 @@
|
|||||||
#define LAYERSHELLQTSHELL_H
|
#define LAYERSHELLQTSHELL_H
|
||||||
|
|
||||||
#include "layershellqt_export.h"
|
#include "layershellqt_export.h"
|
||||||
#include "window.h"
|
|
||||||
|
#if LAYERSHELLQTINTERFACE_ENABLE_DEPRECATED_SINCE(6, 6)
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
namespace LayerShellQt
|
namespace LayerShellQt
|
||||||
@ -19,9 +21,11 @@ namespace LayerShellQt
|
|||||||
class LAYERSHELLQT_EXPORT Shell
|
class LAYERSHELLQT_EXPORT Shell
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
LAYERSHELLQTINTERFACE_DEPRECATED_VERSION(6, 6, "Calling useLayerShell is not needed since Qt 6.5")
|
||||||
static void useLayerShell();
|
static void useLayerShell();
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -9,7 +9,9 @@
|
|||||||
|
|
||||||
#include <layershellqt_logging.h>
|
#include <layershellqt_logging.h>
|
||||||
|
|
||||||
|
#include <QPlatformSurfaceEvent>
|
||||||
#include <QPointer>
|
#include <QPointer>
|
||||||
|
#include <mutex>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|
||||||
#include <QtWaylandClient/private/qwaylandwindow_p.h>
|
#include <QtWaylandClient/private/qwaylandwindow_p.h>
|
||||||
@ -33,8 +35,10 @@ public:
|
|||||||
Window::Layer layer = Window::LayerTop;
|
Window::Layer layer = Window::LayerTop;
|
||||||
QMargins margins;
|
QMargins margins;
|
||||||
QSize desiredSize = QSize(0, 0);
|
QSize desiredSize = QSize(0, 0);
|
||||||
Window::ScreenConfiguration screenConfiguration = Window::ScreenFromQWindow;
|
QPointer<QScreen> screen;
|
||||||
|
bool wantsToBeOnActiveScreen = false;
|
||||||
bool closeOnDismissed = true;
|
bool closeOnDismissed = true;
|
||||||
|
bool activateOnShow = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
static QMap<QWindow *, Window *> s_map;
|
static QMap<QWindow *, Window *> s_map;
|
||||||
@ -150,14 +154,73 @@ Window::Layer Window::layer() const
|
|||||||
return d->layer;
|
return d->layer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if LAYERSHELLQTINTERFACE_BUILD_DEPRECATED_SINCE(6, 6)
|
||||||
Window::ScreenConfiguration Window::screenConfiguration() const
|
Window::ScreenConfiguration Window::screenConfiguration() const
|
||||||
{
|
{
|
||||||
return d->screenConfiguration;
|
if (wantsToBeOnActiveScreen()) {
|
||||||
|
return ScreenFromCompositor;
|
||||||
|
} else {
|
||||||
|
// If an explicit screen is set, it's quite inaccurate but it should be fine.
|
||||||
|
return ScreenFromQWindow;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Window::setScreenConfiguration(Window::ScreenConfiguration screenConfiguration)
|
void Window::setScreenConfiguration(ScreenConfiguration screenConfiguration)
|
||||||
{
|
{
|
||||||
d->screenConfiguration = screenConfiguration;
|
static std::once_flag deprecationFlag;
|
||||||
|
std::call_once(deprecationFlag, []() {
|
||||||
|
qWarning() << "LayerShellQt.Window.screenConfiguration is deprecated use screen and wantsToBeOnActiveScreen instead";
|
||||||
|
});
|
||||||
|
|
||||||
|
if (screenConfiguration == ScreenFromCompositor) {
|
||||||
|
setWantsToBeOnActiveScreen(true);
|
||||||
|
} else {
|
||||||
|
setWantsToBeOnActiveScreen(false);
|
||||||
|
setScreen(nullptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void Window::setWantsToBeOnActiveScreen(bool set)
|
||||||
|
{
|
||||||
|
if (d->wantsToBeOnActiveScreen == set) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
d->wantsToBeOnActiveScreen = set;
|
||||||
|
|
||||||
|
if (d->wantsToBeOnActiveScreen && d->screen) {
|
||||||
|
d->screen = nullptr;
|
||||||
|
Q_EMIT screenChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
Q_EMIT wantsToBeOnActiveScreenChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Window::wantsToBeOnActiveScreen() const
|
||||||
|
{
|
||||||
|
return d->wantsToBeOnActiveScreen;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Window::setScreen(QScreen *screen)
|
||||||
|
{
|
||||||
|
if (d->screen == screen) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
d->screen = screen;
|
||||||
|
|
||||||
|
if (d->screen && d->wantsToBeOnActiveScreen) {
|
||||||
|
d->wantsToBeOnActiveScreen = false;
|
||||||
|
Q_EMIT wantsToBeOnActiveScreenChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
Q_EMIT screenChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
QScreen *Window::screen() const
|
||||||
|
{
|
||||||
|
return d->screen;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Window::closeOnDismissed() const
|
bool Window::closeOnDismissed() const
|
||||||
@ -170,17 +233,50 @@ void Window::setCloseOnDismissed(bool close)
|
|||||||
d->closeOnDismissed = close;
|
d->closeOnDismissed = close;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Window::activateOnShow() const
|
||||||
|
{
|
||||||
|
return d->activateOnShow;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Window::setActivateOnShow(bool activateOnShow)
|
||||||
|
{
|
||||||
|
d->activateOnShow = activateOnShow;
|
||||||
|
}
|
||||||
|
|
||||||
Window::Window(QWindow *window)
|
Window::Window(QWindow *window)
|
||||||
: QObject(window)
|
: QObject(window)
|
||||||
, d(new WindowPrivate(window))
|
, d(new WindowPrivate(window))
|
||||||
{
|
{
|
||||||
s_map.insert(d->parentWindow, this);
|
s_map.insert(d->parentWindow, this);
|
||||||
|
window->installEventFilter(this);
|
||||||
|
if (window->isVisible()) {
|
||||||
|
qCWarning(LAYERSHELLQT) << d->parentWindow << "already has a shell integration. Call QWindow::close() first and show it again.";
|
||||||
|
}
|
||||||
|
|
||||||
window->create();
|
if (window->handle()) {
|
||||||
|
initializeShell();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
|
bool Window::eventFilter(QObject *watched, QEvent *event)
|
||||||
|
{
|
||||||
|
auto window = qobject_cast<QWindow *>(watched);
|
||||||
|
if (!window) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (event->type() == QEvent::PlatformSurface) {
|
||||||
|
if (auto pse = static_cast<QPlatformSurfaceEvent *>(event); pse->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) {
|
||||||
|
initializeShell();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Window::initializeShell()
|
||||||
|
{
|
||||||
|
auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(d->parentWindow->handle());
|
||||||
if (!waylandWindow) {
|
if (!waylandWindow) {
|
||||||
qCWarning(LAYERSHELLQT) << window << "is not a wayland window. Not creating zwlr_layer_surface";
|
qCWarning(LAYERSHELLQT) << d->parentWindow << "is not a wayland window. Not creating zwlr_layer_surface";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -194,7 +290,6 @@ Window::Window(QWindow *window)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
waylandWindow->setShellIntegration(shellIntegration);
|
waylandWindow->setShellIntegration(shellIntegration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,12 @@ class LAYERSHELLQT_EXPORT Window : public QObject
|
|||||||
Q_PROPERTY(qint32 exclusionZone READ exclusionZone WRITE setExclusiveZone NOTIFY exclusionZoneChanged)
|
Q_PROPERTY(qint32 exclusionZone READ exclusionZone WRITE setExclusiveZone NOTIFY exclusionZoneChanged)
|
||||||
Q_PROPERTY(Layer layer READ layer WRITE setLayer NOTIFY layerChanged)
|
Q_PROPERTY(Layer layer READ layer WRITE setLayer NOTIFY layerChanged)
|
||||||
Q_PROPERTY(KeyboardInteractivity keyboardInteractivity READ keyboardInteractivity WRITE setKeyboardInteractivity NOTIFY keyboardInteractivityChanged)
|
Q_PROPERTY(KeyboardInteractivity keyboardInteractivity READ keyboardInteractivity WRITE setKeyboardInteractivity NOTIFY keyboardInteractivityChanged)
|
||||||
|
Q_PROPERTY(bool activateOnShow READ activateOnShow WRITE setActivateOnShow)
|
||||||
|
Q_PROPERTY(bool wantsToBeOnActiveScreen READ wantsToBeOnActiveScreen WRITE setWantsToBeOnActiveScreen NOTIFY wantsToBeOnActiveScreenChanged)
|
||||||
|
Q_PROPERTY(QScreen *screen READ screen WRITE setScreen NOTIFY screenChanged)
|
||||||
|
#if LAYERSHELLQTINTERFACE_ENABLE_DEPRECATED_SINCE(6, 6)
|
||||||
Q_PROPERTY(ScreenConfiguration screenConfiguration READ screenConfiguration WRITE setScreenConfiguration)
|
Q_PROPERTY(ScreenConfiguration screenConfiguration READ screenConfiguration WRITE setScreenConfiguration)
|
||||||
|
#endif
|
||||||
|
|
||||||
public:
|
public:
|
||||||
~Window() override;
|
~Window() override;
|
||||||
@ -39,8 +44,8 @@ public:
|
|||||||
AnchorLeft = 4, ///< The left edge of the anchor rectangle
|
AnchorLeft = 4, ///< The left edge of the anchor rectangle
|
||||||
AnchorRight = 8, ///< The right edge of the anchor rectangle
|
AnchorRight = 8, ///< The right edge of the anchor rectangle
|
||||||
};
|
};
|
||||||
Q_ENUM(Anchor);
|
|
||||||
Q_DECLARE_FLAGS(Anchors, Anchor)
|
Q_DECLARE_FLAGS(Anchors, Anchor)
|
||||||
|
Q_FLAG(Anchors)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This enum type is used to specify the layer where a surface can be put in.
|
* This enum type is used to specify the layer where a surface can be put in.
|
||||||
@ -63,17 +68,6 @@ public:
|
|||||||
};
|
};
|
||||||
Q_ENUM(KeyboardInteractivity)
|
Q_ENUM(KeyboardInteractivity)
|
||||||
|
|
||||||
/**
|
|
||||||
* This enum type is used to specify which screen to place the surface on.
|
|
||||||
* ScreenFromQWindow (the default) reads QWindow::screen() while ScreenFromCompositor
|
|
||||||
* passes nil and lets the compositor decide.
|
|
||||||
*/
|
|
||||||
enum ScreenConfiguration {
|
|
||||||
ScreenFromQWindow = 0,
|
|
||||||
ScreenFromCompositor = 1,
|
|
||||||
};
|
|
||||||
Q_ENUM(ScreenConfiguration)
|
|
||||||
|
|
||||||
void setAnchors(Anchors anchor);
|
void setAnchors(Anchors anchor);
|
||||||
Anchors anchors() const;
|
Anchors anchors() const;
|
||||||
|
|
||||||
@ -95,8 +89,48 @@ public:
|
|||||||
void setLayer(Layer layer);
|
void setLayer(Layer layer);
|
||||||
Layer layer() const;
|
Layer layer() const;
|
||||||
|
|
||||||
|
#if LAYERSHELLQTINTERFACE_ENABLE_DEPRECATED_SINCE(6, 6)
|
||||||
|
/**
|
||||||
|
* This enum type is used to specify which screen to place the surface on.
|
||||||
|
* ScreenFromQWindow (the default) reads QWindow::screen() while ScreenFromCompositor
|
||||||
|
* passes nil and lets the compositor decide.
|
||||||
|
*/
|
||||||
|
LAYERSHELLQTINTERFACE_DEPRECATED_VERSION(6, 6, "Use wantsToBeOnActiveScreen and screen instead")
|
||||||
|
enum ScreenConfiguration {
|
||||||
|
ScreenFromQWindow = 0,
|
||||||
|
ScreenFromCompositor = 1,
|
||||||
|
};
|
||||||
|
Q_ENUM(ScreenConfiguration)
|
||||||
|
|
||||||
|
LAYERSHELLQTINTERFACE_DEPRECATED_VERSION(6, 6, "Use wantsToBeOnActiveScreen and screen instead")
|
||||||
void setScreenConfiguration(ScreenConfiguration screenConfiguration);
|
void setScreenConfiguration(ScreenConfiguration screenConfiguration);
|
||||||
|
LAYERSHELLQTINTERFACE_DEPRECATED_VERSION(6, 6, "Use wantsToBeOnActiveScreen and screen instead")
|
||||||
ScreenConfiguration screenConfiguration() const;
|
ScreenConfiguration screenConfiguration() const;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates whether the layer shell surface should be placed on the active screen based on @a set.
|
||||||
|
*
|
||||||
|
* The active screen depends on the compositor policies.
|
||||||
|
*
|
||||||
|
* If the screen() is @c null and the wantsToBeOnActiveScreen() is @c false, then the
|
||||||
|
* QWindow::screen() will be used to decide what screen the layer shell surface should be placed on.
|
||||||
|
*
|
||||||
|
* The screen() will be reset if @a set is @c true.
|
||||||
|
*/
|
||||||
|
void setWantsToBeOnActiveScreen(bool set);
|
||||||
|
bool wantsToBeOnActiveScreen() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates that the layer shell surface should be placed on the specified @a screen.
|
||||||
|
*
|
||||||
|
* If the screen() is @c null and the wantsToBeOnActiveScreen() is @c false, then the
|
||||||
|
* QWindow::screen() will be used to decide what screen the layer shell surface should be placed on.
|
||||||
|
*
|
||||||
|
* The wantsToBeOnActiveScreen() will be reset to @c false after calling this function.
|
||||||
|
*/
|
||||||
|
void setScreen(QScreen *screen);
|
||||||
|
QScreen *screen() const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets a string based identifier for this window.
|
* Sets a string based identifier for this window.
|
||||||
@ -117,6 +151,18 @@ public:
|
|||||||
void setCloseOnDismissed(bool close);
|
void setCloseOnDismissed(bool close);
|
||||||
bool closeOnDismissed() const;
|
bool closeOnDismissed() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the window should requestActivate on show.
|
||||||
|
*
|
||||||
|
* Normally, you want this enabled but in case of e.g. a desktop window, this can be disabled.
|
||||||
|
*
|
||||||
|
* It does nothing when KeyboardInteractivity is KeyboardInteractivityNone.
|
||||||
|
*
|
||||||
|
* The default is true.
|
||||||
|
*/
|
||||||
|
void setActivateOnShow(bool activateOnShow);
|
||||||
|
bool activateOnShow() const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the LayerShell Window for a given Qt Window
|
* Gets the LayerShell Window for a given Qt Window
|
||||||
* Ownership is not transferred
|
* Ownership is not transferred
|
||||||
@ -125,6 +171,8 @@ public:
|
|||||||
|
|
||||||
static Window *qmlAttachedProperties(QObject *object);
|
static Window *qmlAttachedProperties(QObject *object);
|
||||||
|
|
||||||
|
bool eventFilter(QObject *watched, QEvent *event) override;
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void anchorsChanged();
|
void anchorsChanged();
|
||||||
void exclusionZoneChanged();
|
void exclusionZoneChanged();
|
||||||
@ -133,8 +181,12 @@ Q_SIGNALS:
|
|||||||
void desiredSizeChanged();
|
void desiredSizeChanged();
|
||||||
void keyboardInteractivityChanged();
|
void keyboardInteractivityChanged();
|
||||||
void layerChanged();
|
void layerChanged();
|
||||||
|
void wantsToBeOnActiveScreenChanged();
|
||||||
|
void screenChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void initializeShell();
|
||||||
|
|
||||||
Window(QWindow *window);
|
Window(QWindow *window);
|
||||||
QScopedPointer<WindowPrivate> d;
|
QScopedPointer<WindowPrivate> d;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
#include "qwaylandlayersurface_p.h"
|
#include "qwaylandlayersurface_p.h"
|
||||||
#include "qwaylandxdgactivationv1_p.h"
|
#include "qwaylandxdgactivationv1_p.h"
|
||||||
|
|
||||||
|
#include <QtWaylandClient/private/qwaylandinputdevice_p.h>
|
||||||
#include <QtWaylandClient/private/qwaylandscreen_p.h>
|
#include <QtWaylandClient/private/qwaylandscreen_p.h>
|
||||||
#include <QtWaylandClient/private/qwaylandsurface_p.h>
|
#include <QtWaylandClient/private/qwaylandsurface_p.h>
|
||||||
#include <QtWaylandClient/private/qwaylandwindow_p.h>
|
#include <QtWaylandClient/private/qwaylandwindow_p.h>
|
||||||
@ -26,8 +27,13 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
|
|||||||
, m_window(window)
|
, m_window(window)
|
||||||
{
|
{
|
||||||
wl_output *output = nullptr;
|
wl_output *output = nullptr;
|
||||||
if (m_interface->screenConfiguration() == Window::ScreenFromQWindow) {
|
if (!m_interface->wantsToBeOnActiveScreen()) {
|
||||||
auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(window->window()->screen()->handle());
|
QScreen *desiredScreen = m_interface->screen();
|
||||||
|
if (!desiredScreen) {
|
||||||
|
desiredScreen = window->window()->screen();
|
||||||
|
}
|
||||||
|
|
||||||
|
auto waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen *>(desiredScreen->handle());
|
||||||
// Qt will always assign a screen to a window, but if the compositor has no screens available a dummy QScreen object is created
|
// Qt will always assign a screen to a window, but if the compositor has no screens available a dummy QScreen object is created
|
||||||
// this will not cast to a QWaylandScreen
|
// this will not cast to a QWaylandScreen
|
||||||
if (!waylandScreen) {
|
if (!waylandScreen) {
|
||||||
@ -124,13 +130,7 @@ void QWaylandLayerSurface::attachPopup(QtWaylandClient::QWaylandShellSurface *po
|
|||||||
|
|
||||||
void QWaylandLayerSurface::applyConfigure()
|
void QWaylandLayerSurface::applyConfigure()
|
||||||
{
|
{
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
|
||||||
m_configuring = true;
|
|
||||||
#endif
|
|
||||||
window()->resizeFromApplyConfigure(m_pendingSize);
|
window()->resizeFromApplyConfigure(m_pendingSize);
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
|
||||||
m_configuring = false;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QWaylandLayerSurface::setDesiredSize(const QSize &size)
|
void QWaylandLayerSurface::setDesiredSize(const QSize &size)
|
||||||
@ -181,25 +181,12 @@ void QWaylandLayerSurface::setLayer(uint32_t layer)
|
|||||||
set_layer(layer);
|
set_layer(layer);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
|
||||||
void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
|
|
||||||
{
|
|
||||||
if (m_configuring) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (m_interface->desiredSize().isNull()) {
|
|
||||||
setDesiredSize(geometry.size());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
void QWaylandLayerSurface::setWindowSize(const QSize &size)
|
void QWaylandLayerSurface::setWindowSize(const QSize &size)
|
||||||
{
|
{
|
||||||
if (m_interface->desiredSize().isNull()) {
|
if (m_interface->desiredSize().isNull()) {
|
||||||
setDesiredSize(size);
|
setDesiredSize(size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
bool QWaylandLayerSurface::requestActivate()
|
bool QWaylandLayerSurface::requestActivate()
|
||||||
{
|
{
|
||||||
@ -211,11 +198,15 @@ bool QWaylandLayerSurface::requestActivate()
|
|||||||
activation->activate(m_activationToken, window()->wlSurface());
|
activation->activate(m_activationToken, window()->wlSurface());
|
||||||
m_activationToken = {};
|
m_activationToken = {};
|
||||||
return true;
|
return true;
|
||||||
|
} else if (const auto token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN"); !token.isEmpty()) {
|
||||||
|
activation->activate(token, window()->wlSurface());
|
||||||
|
qunsetenv("XDG_ACTIVATION_TOKEN");
|
||||||
|
return true;
|
||||||
} else {
|
} else {
|
||||||
const auto focusWindow = QGuiApplication::focusWindow();
|
const auto focusWindow = QGuiApplication::focusWindow();
|
||||||
const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();
|
const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();
|
||||||
if (const auto seat = wlWindow->display()->lastInputDevice()) {
|
if (const auto seat = wlWindow->display()->lastInputDevice()) {
|
||||||
const auto tokenProvider = activation->requestXdgActivationToken(wlWindow->display(), wlWindow->wlSurface(), 0, QString());
|
const auto tokenProvider = activation->requestXdgActivationToken(wlWindow->display(), wlWindow->wlSurface(), seat->serial(), QString());
|
||||||
connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) {
|
connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) {
|
||||||
m_shell->activation()->activate(token, window()->wlSurface());
|
m_shell->activation()->activate(token, window()->wlSurface());
|
||||||
});
|
});
|
||||||
@ -226,6 +217,23 @@ bool QWaylandLayerSurface::requestActivate()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool QWaylandLayerSurface::requestActivateOnShow()
|
||||||
|
{
|
||||||
|
if (!m_interface->activateOnShow()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m_interface->keyboardInteractivity() == Window::KeyboardInteractivityNone) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m_window->window()->property("_q_showWithoutActivating").toBool()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return requestActivate();
|
||||||
|
}
|
||||||
|
|
||||||
void QWaylandLayerSurface::setXdgActivationToken(const QString &token)
|
void QWaylandLayerSurface::setXdgActivationToken(const QString &token)
|
||||||
{
|
{
|
||||||
m_activationToken = token;
|
m_activationToken = token;
|
||||||
@ -247,13 +255,6 @@ void QWaylandLayerSurface::requestXdgActivationToken(quint32 serial)
|
|||||||
|
|
||||||
void QWaylandLayerSurface::sendExpose()
|
void QWaylandLayerSurface::sendExpose()
|
||||||
{
|
{
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
|
|
||||||
window()->handleExpose(QRect(QPoint(), m_pendingSize));
|
|
||||||
#elif QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
|
||||||
window()->sendRecursiveExposeEvent();
|
|
||||||
#else
|
|
||||||
window()->updateExposure();
|
window()->updateExposure();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -43,13 +43,10 @@ public:
|
|||||||
void setLayer(uint32_t layer);
|
void setLayer(uint32_t layer);
|
||||||
|
|
||||||
void applyConfigure() override;
|
void applyConfigure() override;
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
|
||||||
void setWindowGeometry(const QRect &geometry) override;
|
|
||||||
#else
|
|
||||||
void setWindowSize(const QSize &size) override;
|
void setWindowSize(const QSize &size) override;
|
||||||
#endif
|
|
||||||
|
|
||||||
bool requestActivate() override;
|
bool requestActivate() override;
|
||||||
|
bool requestActivateOnShow() override;
|
||||||
void setXdgActivationToken(const QString &token) override;
|
void setXdgActivationToken(const QString &token) override;
|
||||||
void requestXdgActivationToken(quint32 serial) override;
|
void requestXdgActivationToken(quint32 serial) override;
|
||||||
|
|
||||||
@ -65,9 +62,6 @@ private:
|
|||||||
QString m_activationToken;
|
QString m_activationToken;
|
||||||
|
|
||||||
bool m_configured = false;
|
bool m_configured = false;
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
|
|
||||||
bool m_configuring = false;
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
42
tests/become-layershell.qml
Normal file
42
tests/become-layershell.qml
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: 2025 Aleix Pol i Gonzalez <aleixpol@kde.org>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: LGPL-3.0-or-later
|
||||||
|
*/
|
||||||
|
|
||||||
|
import QtQuick
|
||||||
|
import QtQuick.Controls
|
||||||
|
import org.kde.layershell 1.0 as LayerShell
|
||||||
|
|
||||||
|
Item
|
||||||
|
{
|
||||||
|
Button {
|
||||||
|
text: "Convert"
|
||||||
|
anchors.centerIn: parent
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
win.close()
|
||||||
|
win.LayerShell.Window.anchors = LayerShell.Window.AnchorLeft;
|
||||||
|
win.LayerShell.Window.layer = LayerShell.Window.LayerTop;
|
||||||
|
win.LayerShell.Window.exclusionZone = -1;
|
||||||
|
win.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Window {
|
||||||
|
id: win
|
||||||
|
|
||||||
|
width: 100
|
||||||
|
height: 100
|
||||||
|
Rectangle {
|
||||||
|
anchors.fill: parent
|
||||||
|
color: "red"
|
||||||
|
|
||||||
|
Text {
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: "top"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
visible: true
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -53,7 +53,7 @@ int main(int argc, char **argv)
|
|||||||
QGuiApplication app(argc, argv);
|
QGuiApplication app(argc, argv);
|
||||||
|
|
||||||
const auto layerMetaEnum = QMetaEnum::fromType<Window::Layer>();
|
const auto layerMetaEnum = QMetaEnum::fromType<Window::Layer>();
|
||||||
const auto anchorMetaEnum = QMetaEnum::fromType<Window::Anchor>();
|
const auto anchorMetaEnum = QMetaEnum::fromType<Window::Anchors>();
|
||||||
|
|
||||||
QCommandLineParser parser;
|
QCommandLineParser parser;
|
||||||
QCommandLineOption marginsOption(QStringLiteral("margins"), QStringLiteral("Window margins"), QStringLiteral("pixels"), QStringLiteral("0"));
|
QCommandLineOption marginsOption(QStringLiteral("margins"), QStringLiteral("Window margins"), QStringLiteral("pixels"), QStringLiteral("0"));
|
||||||
|
|||||||
Reference in New Issue
Block a user