fix bug about no focus

ukui · Sep 27, 2019 · 127306f · 127306f
1 parent 615097f
commit 127306f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/src/fullbackgroundwidget.cpp b/src/fullbackgroundwidget.cpp
@@ -273,6 +273,7 @@ void FullBackgroundWidget::showLockWidget()
         onCursorMoved(cursor().pos());
     }
     lockWidget->setFocus();
+    XSetInputFocus(QX11Info::display(),this->winId(),RevertToNone,CurrentTime);
 }
 
 void FullBackgroundWidget::showScreensaver()

diff --git a/src/iconedit.cpp b/src/iconedit.cpp
@@ -24,7 +24,7 @@
 #include <QKeyEvent>
 #include <QDebug>
 #include <QTimer>
-
+#include <QtX11Extras/QX11Info>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
@@ -110,6 +110,10 @@ bool IconEdit::eventFilter(QObject *obj, QEvent *event)
                 return true;
             }
         }
+	if(event->type() == 23)
+        {
+            XSetInputFocus(QX11Info::display(),this->winId(),RevertToNone,CurrentTime);
+        }
     }
     return false;
 }

diff --git a/src/screensaverwidget.cpp b/src/screensaverwidget.cpp
@@ -28,6 +28,9 @@
 #include <QVBoxLayout>
 #include <QDateTime>
 #include <QPainter>
+#include <QKeyEvent>
+#include <QtX11Extras/QX11Info>
+#include <X11/Xlib.h>
 
 ScreenSaverWidget::ScreenSaverWidget(ScreenSaver *screensaver, QWidget *parent)
     : QWidget(parent),
@@ -40,6 +43,7 @@ ScreenSaverWidget::ScreenSaverWidget(ScreenSaver *screensaver, QWidget *parent)
     qDebug() << *screensaver;
     setMouseTracking(true);
     setFocus();
+     this->installEventFilter(this);
 
     QPalette plt;
     plt.setBrush(QPalette::Window, Qt::black);
@@ -165,7 +169,15 @@ void ScreenSaverWidget::paintEvent(QPaintEvent *event)
     return QWidget::paintEvent(event);
 }
 
+bool ScreenSaverWidget::eventFilter(QObject *obj, QEvent *event)
+{
+    if(event->type() == 23)
+    {
+        XSetInputFocus(QX11Info::display(),this->winId(),RevertToNone,CurrentTime);
 
+    }
+    return false;
+}
 /* Embed xscreensavers */
 void ScreenSaverWidget::embedXScreensaver(const QString &path)
 {

diff --git a/src/screensaverwidget.h b/src/screensaverwidget.h
@@ -35,7 +35,7 @@ class ScreenSaverWidget : public QWidget
 protected:
     void closeEvent(QCloseEvent *);
     void paintEvent(QPaintEvent *event);
-
+    bool eventFilter(QObject *obj, QEvent *event);
 private:
     void embedXScreensaver(const QString &path);
     void initUI();