diff options
| author | Be <be@mixxx.org> | 2021-10-11 21:25:05 -0500 |
|---|---|---|
| committer | Be <be@mixxx.org> | 2021-10-11 21:25:05 -0500 |
| commit | ebec5efee00de4214c56e52f68b7344bfd1e0a4f (patch) | |
| tree | 0939d928a57449af8f07fc3c0dbf2660d3273cba /res/qml | |
| parent | de8b3a41328c7c29a8593bce8012e5e3fa01affb (diff) | |
| parent | 44a1e4f4898bcabfbafa0692589853c16c72b80d (diff) | |
Merge remote-tracking branch 'upstream/main' into effects_refactoring
Diffstat (limited to 'res/qml')
| -rw-r--r-- | res/qml/Deck.qml | 7 | ||||
| -rw-r--r-- | res/qml/Mixxx/Controls/WaveformOverviewMarker.qml | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/res/qml/Deck.qml b/res/qml/Deck.qml index d3661dc5d6..78644c5739 100644 --- a/res/qml/Deck.qml +++ b/res/qml/Deck.qml @@ -185,7 +185,7 @@ Item { let minutes = Math.floor(positionSeconds / 60); let seconds = positionSeconds - (minutes * 60); - let centiseconds = Math.trunc((seconds - Math.trunc(seconds)) * 100); + const deciseconds = Math.trunc((seconds - Math.trunc(seconds)) * 10); seconds = Math.trunc(seconds); if (minutes < 10) minutes = "0" + minutes; @@ -193,10 +193,7 @@ Item { if (seconds < 10) seconds = "0" + seconds; - if (centiseconds < 10) - centiseconds = "0" + centiseconds; - - return minutes + ':' + seconds + "." + centiseconds; + return minutes + ':' + seconds + "." + deciseconds; } Mixxx.ControlProxy { diff --git a/res/qml/Mixxx/Controls/WaveformOverviewMarker.qml b/res/qml/Mixxx/Controls/WaveformOverviewMarker.qml index 509614d228..4f20bc4e55 100644 --- a/res/qml/Mixxx/Controls/WaveformOverviewMarker.qml +++ b/res/qml/Mixxx/Controls/WaveformOverviewMarker.qml @@ -1,6 +1,7 @@ import Mixxx 0.1 as Mixxx import QtQuick 2.12 import QtQuick.Shapes 1.12 +import QtQuick.Window 2.12 Item { id: root @@ -42,7 +43,10 @@ Item { group: root.group key: root.key - onValueChanged: marker.x = parent.width * value + onValueChanged: { + // Math.round saves tons of CPU by avoiding redrawing for fractional pixel positions. + marker.x = Math.round(parent.width * value * Screen.devicePixelRatio) / Screen.devicePixelRatio; + } } } |