Przeglądaj źródła

added tooltip to statuspoint

Malte Veerman 10 lat temu
rodzic
commit
19afb1ccca
2 zmienionych plików z 7 dodań i 29 usunięć
  1. 3 25
      package/contents/ui/PwmFan.qml
  2. 4 4
      package/contents/ui/PwmPoint.qml

+ 3 - 25
package/contents/ui/PwmFan.qml

@@ -124,33 +124,11 @@ Rectangle {
             bottom: settingsArea.top
         }
 
-        Rectangle {
-            property real unscaledTemp: fan.temp ? fan.temp.value : minTemp
-            property real unscaledPwm: fan.pwm
-            
+        StatusPoint {
             id: currentPwm
-            x: parent.scaleX(unscaledTemp) - width/2
-            y: parent.scaleY(unscaledPwm) - height/2
-            width: canvas.fontSize
-            height: width
-            radius: width / 2
-            color: "black"
+            size: canvas.fontSize
             visible: canvas.contains(Coordinates.centerOf(this)) && fan.hasTemp && canvas.drawingEnabled
-            
-            Behavior on unscaledTemp {
-                SpringAnimation {
-                    epsilon: 0.1
-                    spring: 1.0
-                    damping: 0.4
-                }
-            }
-            Behavior on unscaledPwm {
-                SpringAnimation {
-                    epsilon: 0.1
-                    spring: 1.0
-                    damping: 0.4
-                }
-            }                
+            fan: root.fan
         }
         PwmPoint {
             id: stopPoint

+ 4 - 4
package/contents/ui/PwmPoint.qml

@@ -29,14 +29,14 @@ Rectangle {
     readonly property real centerX: x + width / 2
     readonly property real centerY: y + height / 2
     property alias drag: pwmMouse.drag
-    property alias size: root.width
+    property int size: 10
     property int unit: 0
     property var locale: Qt.locale()
 
     id: root
-    width: 10
-    height: width
-    radius: width / 2
+    width: size
+    height: size
+    radius: size / 2
     border.width: pwmMouse.containsMouse || drag.active ? 1 : 0
 
     onXChanged: parent.requestPaint();