更新linux去边框x11支持

Qt-QML · Feb 9, 2022 · 95eebe8 · 95eebe8
1 parent 2a86e27
commit 95eebe8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/GrayFramelesshelper/GrayFramelesshelper.pri b/GrayFramelesshelper/GrayFramelesshelper.pri
@@ -32,7 +32,10 @@ win32 {
         $$PWD/qwinregistry.cpp
     LIBS += -luser32 -lshell32 -ladvapi32
 }
-linux*: SOURCES += $$PWD/utilities_linux.cpp
+linux* {
+    QT += x11extras
+    SOURCES += $$PWD/utilities_linux.cpp
+}
 macx: SOURCES += $$PWD/utilities_macos.mm
 
 macx {

diff --git a/GrayFramelesshelper/framelesshelper.cpp b/GrayFramelesshelper/framelesshelper.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * MIT License
  *
  * Copyright (C) 2021 by wangwenx190 (Yuhang Zhao)
@@ -24,6 +24,14 @@
 
 #include "framelesshelper.h"
 
+#ifdef Q_OS_LINUX
+#include <QX11Info>
+
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/shape.h>
+#endif
+
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
 
 #include <QDateTime>
@@ -200,11 +208,23 @@ bool FramelessHelper::eventFilter(QObject *object, QEvent *event)
     if(m_bLinuxWindowClicked)
     {
         m_bLinuxWindowClicked = false;
-        qDebug() << window->flags();
-        QPoint pos = QPoint(10,10);
-        QMouseEvent Mouseevent(QEvent::MouseButtonPress, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-        QGuiApplication::sendEvent(window, &Mouseevent);
-        window->showNormal();
+        const auto display = QX11Info::display();
+        const auto screen = QX11Info::appScreen();
+
+        XEvent xevent;
+        memset(&xevent, 0, sizeof(XEvent));
+
+        xevent.type = ButtonRelease;
+        xevent.xbutton.button = Button1;
+        xevent.xbutton.window = window->winId();
+        xevent.xbutton.x = pos.x();
+        xevent.xbutton.y = pos.y();
+        xevent.xbutton.x_root = globalPos.x();
+        xevent.xbutton.y_root = globalPos.y();
+        xevent.xbutton.display = display;
+
+        XSendEvent(display, widget->effectiveWinId(), False, ButtonReleaseMask, &xevent);
+        XFlush(display);
         qDebug() << "LinuxWindow ckicked";
     }
 #endif