OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

*Avatar: Calculate thumbnail dimensions based on devicePixelRatio 

Multiply the dimension by the device pixel ratio and then round it to
get the width/height of the thumbnail to use in the request.
pull/21833/head
Robert Swain 2017-04-27 12:38:03 +02:00
parent 3d507e9840
commit 39de37b547
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Avatar.js
View File

@ -22,8 +22,8 @@ module.exports = {
avatarUrlForMember: function(member, width, height, resizeMethod) {
var url = member.getAvatarUrl(
MatrixClientPeg.get().getHomeserverUrl(),
window.devicePixelRatio > 1.2 ? 96 : width,
window.devicePixelRatio > 1.2 ? 96 : height,
Math.floor(width * window.devicePixelRatio),
Math.floor(height * window.devicePixelRatio),
resizeMethod,
false,
false
@ -40,8 +40,8 @@ module.exports = {
avatarUrlForUser: function(user, width, height, resizeMethod) {
var url = ContentRepo.getHttpUriForMxc(
MatrixClientPeg.get().getHomeserverUrl(), user.avatarUrl,
window.devicePixelRatio > 1.2 ? 96 : width,
window.devicePixelRatio > 1.2 ? 96 : height,
Math.floor(width * window.devicePixelRatio),
Math.floor(height * window.devicePixelRatio),
resizeMethod
);
if (!url || url.length === 0) {

16
src/components/views/avatars/RoomAvatar.js
View File

@ -59,8 +59,8 @@ module.exports = React.createClass({
ContentRepo.getHttpUriForMxc(
MatrixClientPeg.get().getHomeserverUrl(),
props.oobData.avatarUrl,
window.devicePixelRatio > 1.2 ? 96 : props.width,
window.devicePixelRatio > 1.2 ? 96 : props.height,
Math.floor(props.width * window.devicePixelRatio),
Math.floor(props.height * window.devicePixelRatio),
props.resizeMethod
), // highest priority
this.getRoomAvatarUrl(props),
@ -76,8 +76,8 @@ module.exports = React.createClass({
return props.room.getAvatarUrl(
MatrixClientPeg.get().getHomeserverUrl(),
window.devicePixelRatio > 1.2 ? 96 : props.width,
window.devicePixelRatio > 1.2 ? 96 : props.height,
Math.floor(props.width * window.devicePixelRatio),
Math.floor(props.height * window.devicePixelRatio),
props.resizeMethod,
false
);
@ -107,16 +107,16 @@ module.exports = React.createClass({
}
return theOtherGuy.getAvatarUrl(
MatrixClientPeg.get().getHomeserverUrl(),
window.devicePixelRatio > 1.2 ? 96 : props.width,
window.devicePixelRatio > 1.2 ? 96 : props.height,
Math.floor(props.width * window.devicePixelRatio),
Math.floor(props.height * window.devicePixelRatio),
props.resizeMethod,
false
);
} else if (userIds.length == 1) {
return mlist[userIds[0]].getAvatarUrl(
MatrixClientPeg.get().getHomeserverUrl(),
window.devicePixelRatio > 1.2 ? 96 : props.width,
window.devicePixelRatio > 1.2 ? 96 : props.height,
Math.floor(props.width * window.devicePixelRatio),
Math.floor(props.height * window.devicePixelRatio),
props.resizeMethod,
false
);