mirror of
https://invent.kde.org/plasma/layer-shell-qt.git
synced 2025-06-04 01:28:35 -04:00
Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
9f83b5177d | ||
|
7ed94f9246 | ||
|
aa4cfaf37e | ||
|
d44f84a8da | ||
|
a0923de84d | ||
|
5dccaf1b84 |
@ -7,6 +7,3 @@ include:
|
|||||||
- /gitlab-templates/reuse-lint.yml
|
- /gitlab-templates/reuse-lint.yml
|
||||||
- /gitlab-templates/linux-qt6.yml
|
- /gitlab-templates/linux-qt6.yml
|
||||||
- /gitlab-templates/freebsd-qt6.yml
|
- /gitlab-templates/freebsd-qt6.yml
|
||||||
- /gitlab-templates/xml-lint.yml
|
|
||||||
- /gitlab-templates/yaml-lint.yml
|
|
||||||
- /gitlab-templates/linux-qt6-next.yml
|
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
Dependencies:
|
Dependencies:
|
||||||
- 'on': ['@all']
|
- 'on': ['@all']
|
||||||
'require':
|
'require':
|
||||||
'frameworks/extra-cmake-modules': '@latest-kf6'
|
'frameworks/extra-cmake-modules': '@latest-kf6'
|
||||||
'third-party/wayland': '@latest'
|
'third-party/wayland': '@latest'
|
||||||
'third-party/wayland-protocols': '@latest'
|
'third-party/wayland-protocols': '@latest'
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
require-passing-tests-on: ['Linux', 'FreeBSD', 'Windows']
|
require-passing-tests-on: ['Linux', 'FreeBSD', 'Windows']
|
||||||
|
@ -4,13 +4,13 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
project(layershellqt)
|
project(layershellqt)
|
||||||
set(PROJECT_VERSION "6.4.80")
|
set(PROJECT_VERSION "6.3.4")
|
||||||
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.7.0")
|
||||||
set(KF6_MIN_VERSION "6.14.0")
|
set(KF6_MIN_VERSION "6.10.0")
|
||||||
set(KDE_COMPILERSETTINGS_LEVEL "5.82")
|
set(KDE_COMPILERSETTINGS_LEVEL "5.82")
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
@ -34,11 +34,6 @@ include(ECMQmlModule)
|
|||||||
include(KDEGitCommitHooks)
|
include(KDEGitCommitHooks)
|
||||||
|
|
||||||
find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
|
find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
|
||||||
|
|
||||||
if (Qt6WaylandClient_VERSION VERSION_GREATER_EQUAL "6.10.0")
|
|
||||||
find_package(Qt6WaylandClientPrivate ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_package(WaylandScanner REQUIRED)
|
find_package(WaylandScanner REQUIRED)
|
||||||
find_package(Wayland 1.3 COMPONENTS Client Server)
|
find_package(Wayland 1.3 COMPONENTS Client Server)
|
||||||
find_package(WaylandProtocols REQUIRED)
|
find_package(WaylandProtocols REQUIRED)
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
maintainer:
|
maintainer:
|
||||||
- vladz
|
- vladz
|
||||||
description: Layer Shell Qt
|
description: Layer Shell Qt
|
||||||
platforms:
|
platforms:
|
||||||
- name: Linux
|
- name: Linux
|
||||||
|
@ -32,7 +32,6 @@ public:
|
|||||||
Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityOnDemand;
|
Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityOnDemand;
|
||||||
Window::Layer layer = Window::LayerTop;
|
Window::Layer layer = Window::LayerTop;
|
||||||
QMargins margins;
|
QMargins margins;
|
||||||
QSize desiredSize = QSize(0, 0);
|
|
||||||
Window::ScreenConfiguration screenConfiguration = Window::ScreenFromQWindow;
|
Window::ScreenConfiguration screenConfiguration = Window::ScreenFromQWindow;
|
||||||
bool closeOnDismissed = true;
|
bool closeOnDismissed = true;
|
||||||
};
|
};
|
||||||
@ -98,21 +97,6 @@ QMargins Window::margins() const
|
|||||||
return d->margins;
|
return d->margins;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Window::setDesiredSize(const QSize &size)
|
|
||||||
{
|
|
||||||
if (size == d->desiredSize) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
d->desiredSize = size;
|
|
||||||
Q_EMIT desiredSizeChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
QSize Window::desiredSize() const
|
|
||||||
{
|
|
||||||
return d->desiredSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Window::setKeyboardInteractivity(KeyboardInteractivity interactivity)
|
void Window::setKeyboardInteractivity(KeyboardInteractivity interactivity)
|
||||||
{
|
{
|
||||||
if (d->keyboardInteractivity != interactivity) {
|
if (d->keyboardInteractivity != interactivity) {
|
||||||
|
@ -86,9 +86,6 @@ public:
|
|||||||
void setMargins(const QMargins &margins);
|
void setMargins(const QMargins &margins);
|
||||||
QMargins margins() const;
|
QMargins margins() const;
|
||||||
|
|
||||||
void setDesiredSize(const QSize &size);
|
|
||||||
QSize desiredSize() const;
|
|
||||||
|
|
||||||
void setKeyboardInteractivity(KeyboardInteractivity interactivity);
|
void setKeyboardInteractivity(KeyboardInteractivity interactivity);
|
||||||
KeyboardInteractivity keyboardInteractivity() const;
|
KeyboardInteractivity keyboardInteractivity() const;
|
||||||
|
|
||||||
@ -130,7 +127,6 @@ Q_SIGNALS:
|
|||||||
void exclusionZoneChanged();
|
void exclusionZoneChanged();
|
||||||
void exclusiveEdgeChanged();
|
void exclusiveEdgeChanged();
|
||||||
void marginsChanged();
|
void marginsChanged();
|
||||||
void desiredSizeChanged();
|
|
||||||
void keyboardInteractivityChanged();
|
void keyboardInteractivityChanged();
|
||||||
void layerChanged();
|
void layerChanged();
|
||||||
|
|
||||||
|
@ -44,11 +44,7 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
|
|||||||
setAnchor(m_interface->anchors());
|
setAnchor(m_interface->anchors());
|
||||||
connect(m_interface, &Window::anchorsChanged, this, [this]() {
|
connect(m_interface, &Window::anchorsChanged, this, [this]() {
|
||||||
setAnchor(m_interface->anchors());
|
setAnchor(m_interface->anchors());
|
||||||
if (m_interface->desiredSize().isNull()) {
|
setDesiredSize(m_window->windowContentGeometry().size());
|
||||||
setDesiredSize(m_window->windowContentGeometry().size());
|
|
||||||
} else {
|
|
||||||
setDesiredSize(m_interface->desiredSize());
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
setExclusiveZone(m_interface->exclusionZone());
|
setExclusiveZone(m_interface->exclusionZone());
|
||||||
@ -65,22 +61,12 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
|
|||||||
setMargins(m_interface->margins());
|
setMargins(m_interface->margins());
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(m_interface, &Window::desiredSizeChanged, this, [this]() {
|
|
||||||
if (!m_interface->desiredSize().isNull()) {
|
|
||||||
setDesiredSize(m_interface->desiredSize());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
setKeyboardInteractivity(m_interface->keyboardInteractivity());
|
setKeyboardInteractivity(m_interface->keyboardInteractivity());
|
||||||
connect(m_interface, &Window::keyboardInteractivityChanged, this, [this]() {
|
connect(m_interface, &Window::keyboardInteractivityChanged, this, [this]() {
|
||||||
setKeyboardInteractivity(m_interface->keyboardInteractivity());
|
setKeyboardInteractivity(m_interface->keyboardInteractivity());
|
||||||
});
|
});
|
||||||
|
|
||||||
if (m_interface->desiredSize().isNull()) {
|
setDesiredSize(window->windowContentGeometry().size());
|
||||||
setDesiredSize(window->windowContentGeometry().size());
|
|
||||||
} else {
|
|
||||||
setDesiredSize(m_interface->desiredSize());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QWaylandLayerSurface::~QWaylandLayerSurface()
|
QWaylandLayerSurface::~QWaylandLayerSurface()
|
||||||
@ -188,16 +174,12 @@ void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_interface->desiredSize().isNull()) {
|
setDesiredSize(geometry.size());
|
||||||
setDesiredSize(geometry.size());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
void QWaylandLayerSurface::setWindowSize(const QSize &size)
|
void QWaylandLayerSurface::setWindowSize(const QSize &size)
|
||||||
{
|
{
|
||||||
if (m_interface->desiredSize().isNull()) {
|
setDesiredSize(size);
|
||||||
setDesiredSize(size);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user