videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-10-03 01:31:53 +02:00
Code Releases Activity

qml: correct disappearing control spacing

Browse Source
This commit is contained in:
Fatih Uzunoglu 2022-04-19 15:42:53 +03:00 committed by Rémi Denis-Courmont
parent cafda67180
commit 92577c1755
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/gui/qt/player/qml/ControlLayout.qml
View File

@ -83,7 +83,7 @@ FocusScope {
anchors.fill: parent
spacing: 0
spacing: playerControlLayout.spacing
Item {
Layout.fillWidth: rightAligned
@ -113,17 +113,6 @@ FocusScope {
Layout.minimumWidth: minimumWidth
Layout.fillWidth: expandable
Layout.maximumWidth: item.implicitWidth
// This is a workaround of not using RowLayout's built-in `spacing`
// RowLayout adds an unwanted spacing at the end of the layout so
// this is used instead.
Layout.rightMargin: {
for (var i = index + 1; i < repeater.count; ++i) {
var item = repeater.itemAt(i)
if (!!item && item.visible)
return playerControlLayout.spacing
}
return 0
}
readonly property real minimumWidth: (expandable ? item.minimumWidth : item.implicitWidth)
readonly property bool expandable: (item.minimumWidth !== undefined)

6
modules/gui/qt/player/qml/PlayerControlLayout.qml
View File

@ -59,7 +59,8 @@ FocusScope {
top: parent.top
bottom: parent.bottom
rightMargin: layoutSpacing
// Spacing for the filler item acts as padding
rightMargin: layoutSpacing - spacing
}
active: !!playerControlLayout.model
@ -124,7 +125,8 @@ FocusScope {
top: parent.top
bottom: parent.bottom
leftMargin: layoutSpacing
// Spacing for the filler item acts as padding
leftMargin: layoutSpacing - spacing
}
active: !!playerControlLayout.model