Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 14:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ Fixed: Bug 570089 - Dragging northwest in tabcandy area creates zero-area tab group

Browse Source
This commit is contained in:
Ian Gilman 2010-06-18 14:42:06 -07:00
parent a15dd94886
commit 1e81ade79e
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
browser/base/content/tabcandy/app/ui.js
View File

@ -419,6 +419,7 @@ window.Page = {
createGroupOnDrag: function(e){
/* e.preventDefault(); */
const minSize = 60;
const minMinSize = 15;
var startPos = {x:e.clientX, y:e.clientY}
var phantom = iQ("<div>")
@ -436,9 +437,18 @@ window.Page = {
.appendTo("body");
function updateSize(e){
var css = {width: e.clientX-startPos.x, height:e.clientY-startPos.y}
if( css.width > minSize || css.height > minSize ) css.opacity = 1;
else css.opacity = .7
var box = new Rect();
box.left = Math.min(startPos.x, e.clientX);
box.right = Math.max(startPos.x, e.clientX);
box.top = Math.min(startPos.y, e.clientY);
box.bottom = Math.max(startPos.y, e.clientY);
var css = box.css();
if(css.width > minMinSize && css.height > minMinSize
&& (css.width > minSize || css.height > minSize))
css.opacity = 1;
else
css.opacity = .7
phantom.css(css);
e.preventDefault();
@ -459,10 +469,11 @@ window.Page = {
}
function finalize(e){
iQ("#bg, .phantom").unbind("mousemove", updateSize);
if( phantom.css("opacity") != 1 ) collapse();
iQ(window).unbind("mousemove", updateSize);
if( phantom.css("opacity") != 1 )
collapse();
else{
var bounds = new Rect(startPos.x, startPos.y, phantom.width(), phantom.height())
var bounds = phantom.bounds();
// Add all of the orphaned tabs that are contained inside the new group
// to that group.
@ -479,7 +490,7 @@ window.Page = {
}
}
iQ("#bg, .phantom").mousemove(updateSize)
iQ(window).mousemove(updateSize)
iQ(window).one('mouseup', finalize);
e.preventDefault();
return false;

13
browser/base/content/tabcandy/core/utils.js
View File

@ -233,6 +233,19 @@ window.Rect.prototype = {
this.top = a.top;
this.width = a.width;
this.height = a.height;
},
// ----------
// Function: css
// Returns an object with the dimensions of this rectangle, suitable for passing into iQ.fn.css.
// You could of course just pass the rectangle straight in, but this is cleaner.
css: function() {
return {
left: this.left,
top: this.top,
width: this.width,
height: this.height
};
}
};