flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

now updateImageProportions(..) appears to work correctly, now need to check .ribbons.correctImageProportionsForRotation(..) and their combination...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-04-24 14:46:43 +03:00
parent 47ed9e35d1
commit 9647c0c9f5
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ui (gen4)/features/ui-single-image.js
View File

@ -90,14 +90,11 @@ var core = require('features/core')
// ...when scaling a horizontal image, the thing starts jumping around.... // ...when scaling a horizontal image, the thing starts jumping around....
function updateImageProportions(){ function updateImageProportions(){
var that = this var that = this
// XXX get this from config...
var threshold = this.config['single-image-proportions-threshold'] || 2 var threshold = this.config['single-image-proportions-threshold'] || 2
var viewer = this.ribbons.viewer var viewer = this.ribbons.viewer
// XXX
return
var img = this.ribbons.getImage() var img = this.ribbons.getImage()
// XXX check if this accounts for margins...
var w = img.outerWidth() var w = img.outerWidth()
var h = img.outerHeight() var h = img.outerHeight()
@ -108,22 +105,18 @@ function updateImageProportions(){
var W = viewer.width() var W = viewer.width()
var H = viewer.height() var H = viewer.height()
// get dimensional scale.... // get dimensional scale....
var s = Math.min(W, H) / Math.min(w, h) var s = Math.min(W, H) / Math.min(w, h)
// image dimension delta...
var d =
// the maximum difference between image and screen proportions...
(Math.max(W, H) / s - Math.min(w, h))
// coefficient: 0 @ c == threshold -> 1 @ c == 1
* (threshold/c - 1)
// total size...
var n = Math.min(w, h) + d
// XXX proportion s between s and 1 depending on c position
// between threshold and 1
// s: const - changes with viewer size
// c: threshold -> 1
//
// factor:
// f: 1/s -> 1
//
//var f =
//s *= f
// get new dimension in image scale...
var n = Math.max(W, H) / s
if(n == Math.max(w, h)){ if(n == Math.max(w, h)){
return return
@ -182,6 +175,8 @@ var SingleImageActions = actions.Actions({
// NOTE: these will get overwritten if/when the user changes the scale... // NOTE: these will get overwritten if/when the user changes the scale...
'single-image-scale': null, 'single-image-scale': null,
'ribbon-scale': null, 'ribbon-scale': null,
'single-image-proportions-threshold': 2,
}, },
toggleSingleImage: ['Interface/Toggle single image view', toggleSingleImage: ['Interface/Toggle single image view',