diff options
| author | Juho Annunen <juho.annunen@qt.io> | 2018-08-21 14:44:48 +0300 |
|---|---|---|
| committer | Teemu Holappa <teemu.holappa@qt.io> | 2018-08-23 06:55:15 +0000 |
| commit | 3594ea2a2dec8a74c2e8baf307c13671ebbdf18c (patch) | |
| tree | a83b1cee09a1050ed2c11854dd3c778ceebea229 /basicsuite/mediaplayer/VolumeControl.qml | |
| parent | e81384c45e5c0b90e07057abd2a8788272d14c0f (diff) | |
Fix scaling, video path & focusing issues on mediaplayer demo
Task-number: QTBUG-62791
Change-Id: I8ea9bcc27fcf0b2d4fb9f7b8ada165f7a5a5d7c8
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'basicsuite/mediaplayer/VolumeControl.qml')
| -rw-r--r-- | basicsuite/mediaplayer/VolumeControl.qml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/basicsuite/mediaplayer/VolumeControl.qml b/basicsuite/mediaplayer/VolumeControl.qml index 4369d04..ab8bec8 100644 --- a/basicsuite/mediaplayer/VolumeControl.qml +++ b/basicsuite/mediaplayer/VolumeControl.qml @@ -59,7 +59,6 @@ Item { property alias volume: volumeSlider.value property bool muted: root.volume == 0.0 property bool volumeItemUp: volumeItem.y == (volumeItem.height + volumeItem.height * 0.05) - //Volume Controls QtButton{ id: toggleVolumeButton @@ -85,7 +84,7 @@ Item { volumeItem.opacity = 0; if (volumeItem.y === 0) - volumeItem.y -= (volumeItem.height + volumeItem.height * 0.05); + volumeItem.y -= (volumeItem.height + itemMargin); else if (volumeItem !== 0) volumeItem.y = 0; } @@ -121,7 +120,7 @@ Item { Slider { id: volumeSlider anchors.bottom: muteVolumeButton.top - anchors.bottomMargin: parent.height * 0.05 + anchors.bottomMargin: itemMargin anchors.top: parent.top anchors.horizontalCenter: muteVolumeButton.horizontalCenter orientation: Qt.Vertical |