Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

MImageBody thumbnail use thumbnail_info for max w and h #4718

Closed
t3chguy wants to merge 1 commit into from
Closed

MImageBody thumbnail use thumbnail_info for max w and h #4718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/components/views/messages/MImageBody.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,14 @@ export default class MImageBody extends React.Component {
let infoWidth;
let infoHeight;

if (content && content.info && content.info.w && content.info.h) {
infoWidth = content.info.w;
infoHeight = content.info.h;
} else {
const info = content && content.info;
if (info && info.thumbnail_info && info.thumbnail_info.w && info.thumbnail_info.h) {
infoWidth = info.thumbnail_info.w;
infoHeight = info.thumbnail_info.h;
} else if (info && info.w && info.h) {
infoWidth = info.w;
infoHeight = info.h;
} else if (!this.state.loadedImageDimensions) {
// Whilst the image loads, display nothing.
//
// Once loaded, use the loaded image dimensions stored in `loadedImageDimensions`.
Expand Down Expand Up @@ -409,7 +413,7 @@ export default class MImageBody extends React.Component {
{ showPlaceholder &&
<div className="mx_MImageBody_thumbnail" style={{
// Constrain width here so that spinner appears central to the loaded thumbnail
maxWidth: infoWidth + "px",
maxWidth: maxWidth + "px",
}}>
<div className="mx_MImageBody_thumbnail_spinner">
{ placeholder }
Expand Down