outfoxxed/layer-shell-qt-nokde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Add a (temporary) way to attach popups to layer surfaces"

Browse source 
This reverts commit fdab1544fb.

Qt 6.6 is out with all the necessary multi-shell apis.
This commit is contained in:
Vlad Zahorodnii 2023-11-06 15:50:19 +02:00
parent d1ab27dd53
commit 6f0bca5593
2 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/interfaces/window.cpp
View file

@ -6,9 +6,6 @@
#include "window.h" #include "window.h"
#include "../qwaylandlayershellintegration_p.h" #include "../qwaylandlayershellintegration_p.h"
#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
#include "../qwaylandlayersurface_p.h"
#endif
#include <layershellqt_logging.h> #include <layershellqt_logging.h>
@ -141,21 +138,6 @@ void Window::setCloseOnDismissed(bool close)
d->closeOnDismissed = close; d->closeOnDismissed = close;
} }
#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
void Window::attachPopup(QWindow *window, xdg_popup *popup)
{
auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
if (!waylandWindow) {
return;
}
auto shellSurface = dynamic_cast<QWaylandLayerSurface *>(waylandWindow->shellSurface());
if (shellSurface) {
shellSurface->get_popup(popup);
}
}
#endif
Window::Window(QWindow *window) Window::Window(QWindow *window)
: QObject(window) : QObject(window)
, d(new WindowPrivate(window)) , d(new WindowPrivate(window))

8
src/interfaces/window.h
View file

@ -14,10 +14,6 @@
#include "layershellqt_export.h" #include "layershellqt_export.h"
#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
struct xdg_popup;
#endif
namespace LayerShellQt namespace LayerShellQt
{ {
class WindowPrivate; class WindowPrivate;
@ -120,10 +116,6 @@ public:
*/ */
static Window *get(QWindow *window); static Window *get(QWindow *window);
#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
static void attachPopup(QWindow *window, xdg_popup *popup);
#endif
static Window *qmlAttachedProperties(QObject *object); static Window *qmlAttachedProperties(QObject *object);
Q_SIGNALS: Q_SIGNALS: