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
448
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
1a8ee9a5
Commit
1a8ee9a5
authored
3 years ago
by
Fatih Uzunoğlu
Committed by
Jean-Baptiste Kempf
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
qml: use Qt Quick Layouts in ArtworkInfoWidget
parent
4d63982c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!789
qml: player controlbar layout management rework
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml
+21
-18
21 additions, 18 deletions
...ui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml
with
21 additions
and
18 deletions
modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml
+
21
−
18
View file @
1a8ee9a5
...
...
@@ -17,6 +17,8 @@
*****************************************************************************/
import
QtQuick
2.11
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Layouts
1.11
import
QtGraphicalEffects
1.0
import
org
.
videolan
.
vlc
0.1
...
...
@@ -60,27 +62,24 @@ AbstractButton {
activeBorderColor
:
colors
.
bgFocus
}
contentItem
:
Row
{
contentItem
:
Row
Layout
{
spacing
:
infoColumn
.
visible
?
VLCStyle
.
margin_xsmall
:
0
Item
{
id
:
coverItem
anchors.verticalCenter
:
parent
.
verticalCenter
implicitHeight
:
childrenRect
.
height
implicitWidth
:
childrenRect
.
width
implicitHeight
:
cover
.
height
implicitWidth
:
cover
.
width
Rectangle
{
id
:
coverRect
anchors.fill
:
cover
anchors.fill
:
parent
color
:
colors
.
bg
}
DropShadow
{
anchors.fill
:
coverRec
t
anchors.fill
:
paren
t
source
:
coverRect
radius
:
8
...
...
@@ -100,16 +99,19 @@ AbstractButton {
?
mainPlaylistController
.
currentItem
.
artwork
:
VLCStyle
.
noArtAlbum
}
fillMode
:
Image
.
PreserveAspectFit
width
:
VLCStyle
.
dp
(
60
)
height
:
VLCStyle
.
dp
(
60
)
mipmap
:
true
Widgets.ToolTipExt
{
x
:
parent
.
x
visible
:
artworkInfoItem
.
visible
&&
infoColumn
.
width
<
infoColumn
.
preferred
Width
&&
infoColumn
.
width
<
infoColumn
.
implicit
Width
&&
(
artworkInfoItem
.
hovered
||
artworkInfoItem
.
visualFocus
)
delay
:
500
...
...
@@ -120,20 +122,19 @@ AbstractButton {
}
}
Column
{
Column
Layout
{
id
:
infoColumn
anchors.verticalCenter
:
parent
.
verticalCenter
readonly
property
real
preferredWidth
:
Math
.
max
(
titleLabel
.
implicitWidth
,
artistLabel
.
implicitWidth
,
progressIndicator
.
implicitWidth
)
width
:
((
extraWidth
>
preferredWidth
))
?
preferredWidth
:
extraWidth
Layout.preferredHeight
:
coverItem
.
implicitHeight
Layout.maximumWidth
:
extraWidth
visible
:
w
idth
>
VLCStyle
.
dp
(
15
,
VLCStyle
.
scale
)
visible
:
(
extraW
idth
)
>
VLCStyle
.
dp
(
15
)
Widgets.MenuLabel
{
id
:
titleLabel
width
:
parent
.
width
Layout.fillWidth
:
true
Layout.fillHeight
:
true
text
:
{
if
(
paintOnly
)
...
...
@@ -147,7 +148,8 @@ AbstractButton {
Widgets.MenuCaption
{
id
:
artistLabel
width
:
parent
.
width
Layout.fillWidth
:
true
Layout.fillHeight
:
true
text
:
{
if
(
paintOnly
)
...
...
@@ -161,7 +163,8 @@ AbstractButton {
Widgets.MenuCaption
{
id
:
progressIndicator
width
:
parent
.
width
Layout.fillWidth
:
true
Layout.fillHeight
:
true
text
:
{
if
(
paintOnly
)
...
...
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