Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
434
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
92577c17
Commit
92577c17
authored
2 years ago
by
Fatih Uzunoğlu
Committed by
Rémi Denis-Courmont
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
qml: correct disappearing control spacing
parent
cafda671
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1795
qml: correct disappearing control spacing
Pipeline
#216152
passed with stage
in 14 minutes and 21 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/gui/qt/player/qml/ControlLayout.qml
+1
-12
1 addition, 12 deletions
modules/gui/qt/player/qml/ControlLayout.qml
modules/gui/qt/player/qml/PlayerControlLayout.qml
+4
-2
4 additions, 2 deletions
modules/gui/qt/player/qml/PlayerControlLayout.qml
with
5 additions
and
14 deletions
modules/gui/qt/player/qml/ControlLayout.qml
+
1
−
12
View file @
92577c17
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
modules/gui/qt/player/qml/PlayerControlLayout.qml
+
4
−
2
View file @
92577c17
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment