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
452
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
e14a0233
Commit
e14a0233
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: enable layering in stackView when miniPlayer effect is available
parent
2e7277f6
No related branches found
Branches containing commit
No related tags found
1 merge request
!2279
qml: fix #27159, #27160
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/gui/qt/maininterface/qml/MainDisplay.qml
+21
-0
21 additions, 0 deletions
modules/gui/qt/maininterface/qml/MainDisplay.qml
modules/gui/qt/player/qml/MiniPlayer.qml
+1
-0
1 addition, 0 deletions
modules/gui/qt/player/qml/MiniPlayer.qml
with
22 additions
and
0 deletions
modules/gui/qt/maininterface/qml/MainDisplay.qml
+
21
−
0
View file @
e14a0233
...
...
@@ -266,6 +266,27 @@ FocusScope {
leftMargin
:
VLCStyle
.
applicationHorizontalMargin
}
// This item is the root of a large hierarchy
// which requires many batches to be rendered.
// When the miniPlayer effect is active, this
// item (source item) gets rendered in an offscreen
// surface. If we don't enable layer here,
// it (along with children) gets rendered again
// in the assigned window.
// If layer is enabled, instead of rendering one
// more time with many batches, a dynamic texture
// from the offscreen surface is used. This behavior
// reduces the amount of batches from 2x to x+1.
// A side effect is having to draw a large texture
// with blending on, but this must be cheaper redrawing
// all the batches.
// TODO: Reconsider this behavior when batching is optimized.
layer.enabled
:
miniPlayer
.
visible
&&
miniPlayer
.
effectAvailable
// Enable clipping so that the effect does not sit
// on top of the source.
clip
:
miniPlayer
.
visible
&&
miniPlayer
.
effectAvailable
Loader
{
z
:
1
anchors
{
...
...
This diff is collapsed.
Click to expand it.
modules/gui/qt/player/qml/MiniPlayer.qml
+
1
−
0
View file @
e14a0233
...
...
@@ -35,6 +35,7 @@ FocusScope {
property
alias
effectSource
:
effect
.
source
property
alias
effectSourceRect
:
effect
.
sourceRect
property
alias
effectAvailable
:
effect
.
effectAvailable
state
:
(
Player
.
playingState
===
Player
.
PLAYING_STATE_STOPPED
)
?
""
:
"
expanded
"
...
...
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