Fix hide on hover

lsk-china · May 19, 2023 · a7c25bf · a7c25bf
1 parent 70c6167
commit a7c25bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/mouseEventThread.cpp b/mouseEventThread.cpp
@@ -63,15 +63,15 @@ void MouseEventThread::processEvent(XRecordInterceptData *hook) {
                 if (queryCursor(relX, relY, absX, absY)) {
                     break;
                 }
-                emit mousePress(QPoint(relX * sensibility, relY * sensibility), QPoint(absX * sensibility, absY * sensibility));
+                emit mousePress(QPoint(relX * sensibility, relY * sensibility), QPoint(relX, relY));
             }
             break;
         case ButtonRelease:
             if (buttonCode == 1) {
                 if (queryCursor(relX, relY, absX, absY)) {
                     break;
                 }
-                emit mouseRelease(QPoint(relX * sensibility, relY * sensibility), QPoint(absX * sensibility, absY * sensibility));
+                emit mouseRelease(QPoint(relX * sensibility, relY * sensibility), QPoint(relX, relY));
             }
             break;
         case MotionNotify:
@@ -85,7 +85,7 @@ void MouseEventThread::processEvent(XRecordInterceptData *hook) {
 //                qDebug() << "motion too small, ignoring...";
 //                break;
 //            }
-            emit mouseEvent(QPoint(relX * sensibility, relY * sensibility), QPoint(absX * sensibility, absY * sensibility));
+            emit mouseEvent(QPoint(relX * sensibility, relY * sensibility), QPoint(relX, relY));
             break;
     }
     XRecordFreeData (hook);

diff --git a/mouseEventThread.h b/mouseEventThread.h
@@ -62,9 +62,9 @@ public slots:
     double sensibility;
 //    int dx, dy, lastx, lasty = 0;
 signals:
-    void mouseEvent(QPoint relPosition, QPoint absPosition);
-    void mousePress(QPoint relPosition, QPoint absPosition);
-    void mouseRelease(QPoint relPosition, QPoint absPosition);
+    void mouseEvent(QPoint relPosition, QPoint rawPosition);
+    void mousePress(QPoint relPosition, QPoint rawPosition);
+    void mouseRelease(QPoint relPosition, QPoint rawPosition);
 };
 
 

diff --git a/widget.cpp b/widget.cpp
@@ -96,16 +96,16 @@ void Widget::live2dInitialized(QLive2dWidget *wid) {
     wid->setModel(this->currentConfiguration.getModelName().toStdString());
     this->initialized = true;
 }
-void Widget::mouseEvent(QPoint rel, QPoint abs) {
+void Widget::mouseEvent(QPoint rel, QPoint raw) {
     //cout<<"rel: "<<rel.x()<<", "<<rel.y()<<endl;
-    //cout<<"abs: "<<abs.x()<<", "<<abs.y()<<endl;
+    //cout<<"abs: "<<raw.x()<<", "<<raw.y()<<endl;
     widget->mouseMove(rel);
     //widget->mouseMove(rel);
     if (this->currentConfiguration.isHideOnHover()) {
-        if (widget->geometry().contains(rel) && widget->isVisible()) {
+        if (widget->geometry().contains(raw) && widget->isVisible()) {
             widget->hide();
         }
-        if (!widget->geometry().contains(rel) && !widget->isVisible()) {
+        if (!widget->geometry().contains(raw) && !widget->isVisible()) {
             widget->show();
         }
     }
@@ -122,10 +122,7 @@ void Widget::setWidgetPosition(bool widgetOnLeft) {
     }
 }
 
-void Widget::mousePress(QPoint rel, QPoint abs) {
-    if (!this->widget->isVisible()) {
-        return;
-    }
+void Widget::mousePress(QPoint rel, QPoint raw) {
     if (this->widget->geometry().contains(rel)) {
         if (this->currentConfiguration.isHideOnHover()) {
             this->widget->mousePress(QPoint(rel.x(), this->height() - rel.y()));
@@ -136,10 +133,7 @@ void Widget::mousePress(QPoint rel, QPoint abs) {
     }
 }
 
-void Widget::mouseRelease(QPoint rel, QPoint abs) {
-    if (!this->widget->isVisible()) {
-        return;
-    }
+void Widget::mouseRelease(QPoint rel, QPoint raw) {
     if (this->widget->geometry().contains(rel)) {
         if (this->currentConfiguration.isHideOnHover()) {
             this->widget->mouseRelease(QPoint(rel.x(), this->height() - rel.y()));