6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Merge branch 'develop' into feature/fix_358

This commit is contained in:
Valere 2019-08-27 04:34:24 -04:00 committed by GitHub
parent 7966ebef03 5d002532d3
commit 704da1be55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -12,6 +12,7 @@ Other changes:


Bugfix: Bugfix:
- Date change message repeats for each redaction until a normal message (#358) - Date change message repeats for each redaction until a normal message (#358)
- Slide-in reply icon is distorted (#423)


Translations: Translations:
- -

11
vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomMessageTouchHelperCallback.kt
View File

@ -191,12 +191,13 @@ class RoomMessageTouchHelperCallback(private val context: Context,
} }


val y = (itemView.top + itemView.measuredHeight / 2).toFloat() val y = (itemView.top + itemView.measuredHeight / 2).toFloat()
//magic numbers? val hw = imageDrawable.intrinsicWidth / 2f
val hh = imageDrawable.intrinsicHeight / 2f
imageDrawable.setBounds( imageDrawable.setBounds(
(x - convertToPx(12) * scale).toInt(), (x - hw * scale).toInt(),
(y - convertToPx(11) * scale).toInt(), (y - hh * scale).toInt(),
(x + convertToPx(12) * scale).toInt(), (x + hw * scale).toInt(),
(y + convertToPx(10) * scale).toInt() (y + hh * scale).toInt()
) )
imageDrawable.draw(canvas) imageDrawable.draw(canvas)
imageDrawable.alpha = 255 imageDrawable.alpha = 255