diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2014-09-18 20:25:57 +0400 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2014-09-19 11:09:35 +0400 |
commit | 13bbcd0f59ef7a4459a6909079f0a558913e808a (patch) | |
tree | d30c3d1a5c334fd7a6ece3a65c7788fdac65cdff /skins | |
parent | 8ef203827ff6accd8ebf40051f881508815591ac (diff) |
Fix splitter code to properly work with 1px size borders
Diffstat (limited to 'skins')
-rw-r--r-- | skins/larry/ui.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/skins/larry/ui.js b/skins/larry/ui.js index 2a6bffe64..5cd216724 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -1280,8 +1280,8 @@ function rcube_splitter(p) this.resize = function() { if (this.horizontal) { - this.p1.css('height', Math.floor(this.pos - this.p1pos.top - this.halfsize) + 'px'); - this.p2.css('top', Math.ceil(this.pos + this.halfsize + 2) + 'px'); + this.p1.css('height', Math.floor(this.pos - this.p1pos.top - Math.floor(this.halfsize)) + 'px'); + this.p2.css('top', Math.ceil(this.pos + Math.ceil(this.halfsize) + 2) + 'px'); this.handle.css('top', Math.round(this.pos - this.halfsize + this.offset)+'px'); if (bw.ie) { var new_height = parseInt(this.parent.outerHeight(), 10) - parseInt(this.p2.css('top'), 10) - (bw.ie8 ? 2 : 0); @@ -1289,8 +1289,8 @@ function rcube_splitter(p) } } else { - this.p1.css('width', Math.floor(this.pos - this.p1pos.left - this.halfsize) + 'px'); - this.p2.css('left', Math.ceil(this.pos + this.halfsize) + 'px'); + this.p1.css('width', Math.floor(this.pos - this.p1pos.left - Math.floor(this.halfsize)) + 'px'); + this.p2.css('left', Math.ceil(this.pos + Math.ceil(this.halfsize)) + 'px'); this.handle.css('left', Math.round(this.pos - this.halfsize + this.offset + 3)+'px'); if (bw.ie) { var new_width = parseInt(this.parent.outerWidth(), 10) - parseInt(this.p2.css('left'), 10) ; @@ -1373,7 +1373,7 @@ function rcube_splitter(p) if (me.horizontal) { if (((pos.y - me.halfsize) > me.p1pos.top) && ((pos.y + me.halfsize) < (me.p2pos.top + me.p2.outerHeight()))) { - me.pos = Math.max(me.min, pos.y - me.offset); + me.pos = Math.max(me.min, pos.y - Math.max(0, me.offset)); if (me.pos > me.min) me.pos = Math.min(me.pos, me.parent.height() - me.min); @@ -1382,7 +1382,7 @@ function rcube_splitter(p) } else { if (((pos.x - me.halfsize) > me.p1pos.left) && ((pos.x + me.halfsize) < (me.p2pos.left + me.p2.outerWidth()))) { - me.pos = Math.max(me.min, pos.x - me.offset); + me.pos = Math.max(me.min, pos.x - Math.max(0, me.offset)); if (me.pos > me.min) me.pos = Math.min(me.pos, me.parent.width() - me.min); |