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

some cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-10-17 08:24:00 +04:00
parent b931115019
commit 019956c777
1 changed files with 1 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
ui (gen4)/ribbons.js
View File

@ -273,6 +273,7 @@ module.RibbonsPrototype = {
getOrigin: function(){ getOrigin: function(){
return getElementOrigin(this.viewer.find('.ribbon-set')) return getElementOrigin(this.viewer.find('.ribbon-set'))
}, },
// Set ribbon set origin... // Set ribbon set origin...
// //
// Set origin to center of current image // Set origin to center of current image
@ -287,58 +288,6 @@ module.RibbonsPrototype = {
// .setOrigin(x, y) // .setOrigin(x, y)
// -> ribbons // -> ribbons
// //
// XXX this appears not to be scale-neutral -- it gets a different
// set of numbers in ribbons >0 after doing .centerRibbon(..)
// ...but before calling .centerRibbon(..) this does everything
// quite correctly...
//
// ...this mutual dependency between this and .centerRibbon(..)
// makes it really hards to find where exactly the problem is...
//
// XXX should this also update offset????
/*
setOrigin: function(a, b){
var s = this.getScale()
var ribbon_set = this.viewer.find('.ribbon-set')
if(typeof(a) == typeof(123) && typeof(b) == typeof(123)){
var t = a
var l = b
} else {
if(a == null){
var img = this.getImage()
} else {
var img = this.getImage(a)
}
var io = img.offset()
var vo = this.viewer.offset()
// get distance from center of image to top left corner of
// screen...
// NOTE: the result should be scale-neutral.
var l = (io.left - vo.left) + (img.width()*s)/2
var t = (io.top - vo.top) + (img.height()*s)/2
}
var rs = getElementOffset(ribbon_set)
var ot = t - rs.top
var ol = l - rs.left
var ro = this.getOrigin()
console.log('### origin:', ol, ot)
setElementOrigin(ribbon_set, ol+'px', ot+'px')
//setElementOffset(ribbon_set,
// rs.left + (ro.left - ro.left*s) - (l - l*s),
// rs.top + (ro.top - ro.top*s) - (t - t*s))
return this
},
*/
setOrigin: function(a, b){ setOrigin: function(a, b){
var ribbon_set = this.viewer.find('.ribbon-set') var ribbon_set = this.viewer.find('.ribbon-set')
var ro = ribbon_set.offset() var ro = ribbon_set.offset()
@ -1459,33 +1408,6 @@ module.RibbonsPrototype = {
}, },
// center a ribbon vertically... // center a ribbon vertically...
// //
/*
centerRibbon: function(target, offset, scale){
scale = scale == null ? this.getScale() : scale
// NOTE: when woring with origin we do not care about scale...
//scale = scale == null ? 1 : scale
offset = offset == null
// XXX this should not get affected by scale or origin...
// XXX this gives correct resolts ONLY when we got scaled when
// focused on ribbon 0, in other cases it's messed up...
? this._getOffset(target, null, null, null, 1).top
: offset.top
var ot = this.getOrigin().top
// XXX something is still missing here...
// ...it's getting closer when enlarging and blows up when scale -> 0
offset -= (ot/scale - ot)
console.log('### offset-top:', offset)
setElementOffset(this.viewer.find('.ribbon-set'), 0, offset)
return this
},
*/
// XXX experimental... // XXX experimental...
centerRibbon: function(target, offset, scale){ centerRibbon: function(target, offset, scale){
var ribbon_set = this.viewer.find('.ribbon-set') var ribbon_set = this.viewer.find('.ribbon-set')