PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

fix #984, allow zooming GIFs

Browse source
This commit is contained in:
tibbi 2019-01-16 21:48:25 +01:00
parent fd229eea8a
commit 95492d5e06
1 changed files with 14 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MyZoomableGifTextureView.kt
View file

@ -14,8 +14,6 @@ import pl.droidsonroids.gif.GifTextureView
// allow horizontal swipes through the layout, else it can cause glitches at zoomed in images // allow horizontal swipes through the layout, else it can cause glitches at zoomed in images
class MyZoomableGifTextureView(context: Context, attrs: AttributeSet) : GifTextureView(context, attrs) { class MyZoomableGifTextureView(context: Context, attrs: AttributeSet) : GifTextureView(context, attrs) {
private var mSaveScale = 1f private var mSaveScale = 1f
private var mRight = 0f
private var mBottom = 0f
private var mLastTouchX = 0f private var mLastTouchX = 0f
private var mLastTouchY = 0f private var mLastTouchY = 0f
private var mTouchDownTime = 0L private var mTouchDownTime = 0L
@ -32,8 +30,6 @@ class MyZoomableGifTextureView(context: Context, attrs: AttributeSet) : GifTextu
private var mScaleDetector: ScaleGestureDetector? = null private var mScaleDetector: ScaleGestureDetector? = null
private var mMatrices = FloatArray(9) private var mMatrices = FloatArray(9)
private val mMatrix = Matrix() private val mMatrix = Matrix()
private var mOrigRect = RectF()
private var mWantedRect = RectF()
private var mCurrentViewport = RectF() private var mCurrentViewport = RectF()
init { init {
@ -55,9 +51,9 @@ class MyZoomableGifTextureView(context: Context, attrs: AttributeSet) : GifTextu
mScreenHeight = screenHeight.toFloat() mScreenHeight = screenHeight.toFloat()
// we basically want scaleType fitCenter, but we have to use matrices to reach that // we basically want scaleType fitCenter, but we have to use matrices to reach that
mOrigRect = RectF(0f, 0f, mGifWidth, mGifHeight) val origRect = RectF(0f, 0f, mGifWidth, mGifHeight)
mWantedRect = RectF(0f, 0f, mScreenWidth, mScreenHeight) val wantedRect = RectF(0f, 0f, mScreenWidth, mScreenHeight)
mMatrix.setRectToRect(mOrigRect, mWantedRect, Matrix.ScaleToFit.CENTER) mMatrix.setRectToRect(origRect, wantedRect, Matrix.ScaleToFit.CENTER)
mMatrix.getValues(mMatrices) mMatrix.getValues(mMatrices)
val left = mMatrices[Matrix.MTRANS_X] val left = mMatrices[Matrix.MTRANS_X]
@ -72,7 +68,7 @@ class MyZoomableGifTextureView(context: Context, attrs: AttributeSet) : GifTextu
} }
override fun onTouchEvent(event: MotionEvent): Boolean { override fun onTouchEvent(event: MotionEvent): Boolean {
// mScaleDetector?.onTouchEvent(event) mScaleDetector?.onTouchEvent(event)
when (event.actionMasked) { when (event.actionMasked) {
MotionEvent.ACTION_DOWN -> { MotionEvent.ACTION_DOWN -> {
@ -98,33 +94,21 @@ class MyZoomableGifTextureView(context: Context, attrs: AttributeSet) : GifTextu
MotionEvent.ACTION_MOVE -> { MotionEvent.ACTION_MOVE -> {
if (mCurrZoomMode == ZOOM_MODE_ZOOM || mCurrZoomMode == ZOOM_MODE_DRAG && mSaveScale > MIN_VIDEO_ZOOM_SCALE) { if (mCurrZoomMode == ZOOM_MODE_ZOOM || mCurrZoomMode == ZOOM_MODE_DRAG && mSaveScale > MIN_VIDEO_ZOOM_SCALE) {
var diffX = event.x - mLastTouchX var diffX = event.x - mLastTouchX
var diffY = event.y - mLastTouchY
// horizontal bounds // horizontal bounds
if (mCurrentViewport.left + diffX < 0) { if (mCurrentViewport.left >= 0) {
diffX = -mCurrentViewport.left diffX = -mCurrentViewport.left
} else if (mCurrentViewport.right + diffX > mScreenWidth) { } else if (mCurrentViewport.right + diffX >= mScreenWidth * mSaveScale) {
diffX = mScreenWidth - mCurrentViewport.right diffX = -((mScreenWidth * mSaveScale) - mCurrentViewport.right)
}
// vertical bounds
if (mCurrentViewport.top + diffY < 0) {
diffY = -mCurrentViewport.top
} else if (mCurrentViewport.bottom + diffY > mScreenHeight) {
diffY = mScreenHeight - mCurrentViewport.bottom
} }
mCurrentViewport.left += diffX mCurrentViewport.left += diffX
mCurrentViewport.right += diffX mCurrentViewport.right += diffX
mCurrentViewport.top += diffY
mCurrentViewport.bottom += diffY
mMatrix.postTranslate(diffX, diffY) mMatrix.postTranslate(diffX, 0f)
mCurrentViewport.left = Math.max(mCurrentViewport.left, 0f) mCurrentViewport.left = Math.max(mCurrentViewport.left, 0f)
mCurrentViewport.right = Math.min(mCurrentViewport.right, mScreenWidth) mCurrentViewport.right = Math.min(mCurrentViewport.right, mScreenWidth)
mCurrentViewport.top = Math.max(mCurrentViewport.top, 0f)
mCurrentViewport.bottom = Math.min(mCurrentViewport.bottom, mScreenHeight)
mLastTouchX = event.x mLastTouchX = event.x
mLastTouchY = event.y mLastTouchY = event.y
@ -166,20 +150,13 @@ class MyZoomableGifTextureView(context: Context, attrs: AttributeSet) : GifTextu
scaleFactor = MIN_VIDEO_ZOOM_SCALE / origScale scaleFactor = MIN_VIDEO_ZOOM_SCALE / origScale
} }
mRight = width * mSaveScale - width
mBottom = height * mSaveScale - height
mMatrix.postScale(scaleFactor, scaleFactor, detector.focusX, detector.focusY) mMatrix.postScale(scaleFactor, scaleFactor, detector.focusX, detector.focusY)
if (scaleFactor < 1) { mMatrix.getValues(mMatrices)
mMatrix.getValues(mMatrices) val left = mMatrices[Matrix.MTRANS_X]
val y = mMatrices[Matrix.MTRANS_Y] val top = mMatrices[Matrix.MTRANS_Y]
if (scaleFactor < 1) { val right = mScreenWidth - left
if (y < -mBottom) { val bottom = mScreenHeight - top
mMatrix.postTranslate(0f, -(y + mBottom)) mCurrentViewport.set(left, top, right, bottom)
} else if (y > 0) {
mMatrix.postTranslate(0f, -y)
}
}
}
return true return true
} }
} }