Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Merge requests
!15
Video player enhancements
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Video player enhancements
video_player_enhancements
into
master
Overview
2
Commits
19
Pipelines
5
Changes
9
1 unresolved thread
Hide all comments
Merged
Joe Donofry
requested to merge
video_player_enhancements
into
master
3 years ago
Overview
2
Commits
19
Pipelines
5
Changes
6
1 unresolved thread
Hide all comments
Expand
Based on lurkki's updates:
https://github.com/Nheko-Reborn/nheko/pull/302
Refactor code into reusable components
Fix bugs as necessary and change some theming
Edited
3 years ago
by
Nicolas Werner
0
0
Merge request reports
Compare
version 2
version 4
435047b1
3 years ago
version 3
c5e8b2da
3 years ago
version 2
e3eb87cc
3 years ago
version 1
df17e4e2
3 years ago
master (base)
and
version 3
latest version
b7b4fd0e
19 commits,
3 years ago
version 4
435047b1
18 commits,
3 years ago
version 3
c5e8b2da
16 commits,
3 years ago
version 2
e3eb87cc
15 commits,
3 years ago
version 1
df17e4e2
14 commits,
3 years ago
Show latest version
6 files
+
191
−
75
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
6
Search (e.g. *.vue) (Ctrl+P)
resources/qml/delegates/PlayableMediaMessage.qml
+
4
−
4
Options
@@ -7,7 +7,7 @@ import "../ui/media"
import
QtMultimedia
5.15
import
QtQuick
2.15
import
QtQuick
.
Controls
2.15
import
QtQuick
.
Layouts
1.
2
import
QtQuick
.
Layouts
1.
15
import
im
.
nheko
1.0
ColumnLayout
{
@@ -45,8 +45,8 @@ ColumnLayout {
property
bool
tooHigh
:
tempHeight
>
timelineRoot
.
height
/
divisor
color
:
type
==
MtxEvent
.
VideoMessage
?
Nheko
.
colors
.
window
:
"
transparent
"
Layout.preferredHeight
:
type
==
MtxEvent
.
VideoMessage
?
tooHigh
?
timelineRoot
.
height
/
divisor
:
tempHeight
:
4
0
Layout.preferredWidth
:
tooHigh
?
(
timelineRoot
.
height
/
divisor
)
/
proportionalHeight
:
tempWidth
Layout.preferredHeight
:
type
==
MtxEvent
.
VideoMessage
?
tooHigh
?
timelineRoot
.
height
/
divisor
:
tempHeight
:
8
0
Layout.preferredWidth
:
type
==
MtxEvent
.
VideoMessage
?
tooHigh
?
(
timelineRoot
.
height
/
divisor
)
/
proportionalHeight
:
tempWidth
:
250
Image
{
anchors.fill
:
parent
@@ -73,11 +73,11 @@ ColumnLayout {
y
:
type
==
MtxEvent
.
VideoMessage
?
videoOutput
.
contentRect
.
y
:
videoContainer
.
y
width
:
type
==
MtxEvent
.
VideoMessage
?
videoOutput
.
contentRect
.
width
:
videoContainer
.
width
height
:
type
==
MtxEvent
.
VideoMessage
?
videoOutput
.
contentRect
.
height
:
videoContainer
.
height
playingVideo
:
type
==
MtxEvent
.
VideoMessage
positionValue
:
mxcmedia
.
position
duration
:
mxcmedia
.
duration
mediaLoaded
:
mxcmedia
.
loaded
mediaState
:
mxcmedia
.
state
volumeOrientation
:
Qt
.
Vertical
onPositionChanged
:
mxcmedia
.
position
=
position
onPlayPauseActivated
:
mxcmedia
.
state
==
MediaPlayer
.
PlayingState
?
mxcmedia
.
pause
()
:
mxcmedia
.
play
()
onLoadActivated
:
mxcmedia
.
eventId
=
eventId
Loading