Merge pull request #1902 from Be-ing/revert_to_update

only use WidgetRenderTimer on macOS

4 files changed, 14 insertions, 2 deletions

diff --git a/src/widget/slidereventhandler.h b/src/widget/slidereventhandler.h
index 246588bd0c..730cd70188 100644
--- a/src/widget/slidereventhandler.h
+++ b/src/widget/slidereventhandler.h
@@ -145,7 +145,7 @@ class SliderEventHandler {
             // parents.
             if (newPos != m_dPos) {
                 m_dPos = newPos;
-                pWidget->inputActivity();
+                pWidget->update();
             }
         }
     }
diff --git a/src/widget/wknob.cpp b/src/widget/wknob.cpp
index c05d19c60b..04e9a57813 100644
--- a/src/widget/wknob.cpp
+++ b/src/widget/wknob.cpp
@@ -47,5 +47,9 @@ void WKnob::wheelEvent(QWheelEvent* e) {
 }
 
 void WKnob::inputActivity() {
+#ifdef __APPLE__
     m_renderTimer.activity();
+#else
+    update();
+#endif
 }
diff --git a/src/widget/wknobcomposed.cpp b/src/widget/wknobcomposed.cpp
index bf6f31eb65..ac12e69438 100644
--- a/src/widget/wknobcomposed.cpp
+++ b/src/widget/wknobcomposed.cpp
@@ -84,7 +84,7 @@ void WKnobComposed::onConnectedControlChanged(double dParameter, double dValue)
     // angle range? Right now it's just 1/100th of a degree.
     if (fabs(angle - m_dCurrentAngle) > 0.01) {
         // paintEvent updates m_dCurrentAngle
-        inputActivity();
+        update();
     }
 }
 
@@ -137,5 +137,9 @@ void WKnobComposed::wheelEvent(QWheelEvent* e) {
 }
 
 void WKnobComposed::inputActivity() {
+#ifdef __APPLE__
     m_renderTimer.activity();
+#else
+    update();
+#endif
 }
diff --git a/src/widget/wslidercomposed.cpp b/src/widget/wslidercomposed.cpp
index 1b7f4835b7..db63e0b280 100644
--- a/src/widget/wslidercomposed.cpp
+++ b/src/widget/wslidercomposed.cpp
@@ -233,5 +233,9 @@ double WSliderComposed::calculateHandleLength() {
 }
 
 void WSliderComposed::inputActivity() {
+#ifdef __APPLE__
     m_renderTimer.activity();
+#else
+    update();
+#endif
 }