Skip to content

Fix display of tiny images #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Mar 29, 2019
Merged

Fix display of tiny images #55

Show file tree
Hide file tree
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
262 changes: 214 additions & 48 deletions js/viewer.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer.js.map
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 18 additions & 6 deletions src/components/Images.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
}"
:src="data"
:style="{
height: zoomHeight + 'px',
width: zoomWidth + 'px',
height: minHeight,
width: minWidth,
marginTop: shiftY + 'px',
marginLeft: shiftX + 'px'
}"
Expand Down Expand Up @@ -68,6 +68,19 @@ export default {
},
zoomWidth() {
return Math.round(this.width * this.zoomRatio)
},

// prevent images smaller than 100px
minHeight() {
return this.zoomWidth < 100
? null
: this.zoomHeight + 'px'
},
// prevent images smaller than 100px
minWidth() {
return this.zoomHeight < 100
? null
: this.zoomWidth + 'px'
}
},
asyncComputed: {
Expand Down Expand Up @@ -103,11 +116,10 @@ export default {
updateImgSize() {
const naturalHeight = this.$el.naturalHeight
const naturalWidth = this.$el.naturalWidth
// displaying tiny images makes no sense,
// let's try to an least dispay them at 100x100

this.updateHeightWidth(
Math.max(naturalHeight, 100),
Math.max(naturalWidth, 100)
naturalHeight,
naturalWidth
)

this.doneLoading()
Expand Down