更新文档

control/cpumemorylabel/cpumemorylabel.cpp

@@ -33,8 +33,10 @@ CpuMemoryLabel::CpuMemoryLabel(QWidget *parent) : QLabel(parent)
     connect(timerMemory, SIGNAL(timeout()), this, SLOT(getMemory()));
 
     //执行命令获取
+#ifndef Q_OS_WASM
     process = new QProcess(this);
     connect(process, SIGNAL(readyRead()), this, SLOT(readData()));
+#endif
 
     showText = true;
 }
@@ -59,7 +61,10 @@ void CpuMemoryLabel::start(int interval)
 
 void CpuMemoryLabel::stop()
 {
+#ifndef Q_OS_WASM
     process->close();
+#endif
+
     if (timerCPU->isActive()) {
         timerCPU->stop();
     }

control/devicebutton/devicebutton.cpp

@@ -103,11 +103,15 @@ bool DeviceButton::eventFilter(QObject *watched, QEvent *event)
         if (canMove && isPressed) {
             int dx = mouseEvent->pos().x() - lastPoint.x();
             int dy = mouseEvent->pos().y() - lastPoint.y();
-            this->move(this->x() + dx, this->y() + dy);
+            this->move(this->x() + dx, this->y() + dy);            
             return true;
         }
     } else if (type == QEvent::MouseButtonRelease) {
         isPressed = false;
+        //增加刷新父窗体/防止残影
+        if (this->parent()) {
+            QMetaObject::invokeMethod(this->parent(), "update");
+        }
     } else if (type == QEvent::MouseButtonDblClick) {
         Q_EMIT doubleClicked();
     }

control/navbutton/navbutton.cpp

@@ -46,7 +46,7 @@ NavButton::NavButton(QWidget *parent) : QPushButton(parent)
     setText("导航按钮");
 }
 
-void NavButton::enterEvent(QEvent *)
+void NavButton::enterEvent(EnterEvent *)
 {
     hover = true;
     this->update();

control/navbutton/navbutton.h

@@ -15,6 +15,12 @@
 
 #include <QPushButton>
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
+#define EnterEvent QEnterEvent
+#else
+#define EnterEvent QEvent
+#endif
+
 #ifdef quc
 class Q_DECL_EXPORT NavButton : public QPushButton
 #else
@@ -92,7 +98,7 @@ class NavButton : public QPushButton
     explicit NavButton(QWidget *parent = 0);
 
 protected:
-    void enterEvent(QEvent *);
+    void enterEvent(EnterEvent *);
     void leaveEvent(QEvent *);
     void paintEvent(QPaintEvent *);
     void drawBg(QPainter *painter);