Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
529
Issue boards
Milestones
Wiki
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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-Android
Commits
7aa8b715
Commit
7aa8b715
authored
3 years ago
by
Duncan McNamara
Browse files
Options
Downloads
Patches
Plain Diff
VideoControls: fix hud hidden after scale gesture
Fixes
#2328
parent
c8c95a99
No related branches found
No related tags found
1 merge request
!1229
VideoControls improvements
Pipeline
#181841
passed with stage
in 19 minutes and 54 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
application/vlc-android/src/org/videolan/vlc/gui/video/VideoTouchDelegate.kt
+1
-4
1 addition, 4 deletions
...roid/src/org/videolan/vlc/gui/video/VideoTouchDelegate.kt
with
1 addition
and
4 deletions
application/vlc-android/src/org/videolan/vlc/gui/video/VideoTouchDelegate.kt
+
1
−
4
View file @
7aa8b715
...
...
@@ -42,7 +42,6 @@ private const val TOUCH_BRIGHTNESS = 2
private
const
val
TOUCH_MOVE
=
3
private
const
val
TOUCH_TAP_SEEK
=
4
private
const
val
TOUCH_IGNORE
=
5
private
const
val
TOUCH_SWIPE_SEEK
=
6
private
const
val
MIN_FOV
=
20f
private
const
val
MAX_FOV
=
150f
...
...
@@ -311,12 +310,9 @@ class VideoTouchDelegate(private val player: VideoPlayerActivity,
private
val
TAG
=
this
::
class
.
java
.
name
private
fun
doSeekTouch
(
coef
:
Int
,
gesturesize
:
Float
,
seek
:
Boolean
)
{
Log
.
d
(
TAG
,
"doSeekTouch: ${touchControls and TOUCH_FLAG_SWIPE_SEEK}"
)
if
(
touchControls
and
TOUCH_FLAG_SWIPE_SEEK
!=
0
)
{
var
coef
=
coef
if
(
coef
==
0
)
coef
=
1
Log
.
d
(
TAG
,
"doSeekTouch: coef: $coef"
)
Log
.
d
(
TAG
,
"doSeekTouch: abs(gesturesize): ${abs(gesturesize)}"
)
// No seek action if coef > 0.5 and gesturesize < 1cm
if
(
abs
(
gesturesize
)
<
1
||
!
player
.
service
!!
.
isSeekable
)
return
...
...
@@ -437,6 +433,7 @@ class VideoTouchDelegate(private val player: VideoPlayerActivity,
}
else
if
(!
grow
&&
player
.
currentScaleType
==
MediaPlayer
.
ScaleType
.
SURFACE_FIT_SCREEN
)
{
player
.
setVideoScale
(
MediaPlayer
.
ScaleType
.
SURFACE_BEST_FIT
)
}
touchAction
=
TOUCH_NONE
}
}
}
...
...
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