stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Calculate drop position based on visual positions of tabs

Browse Source
This commit is contained in:
Piro / YUKI Hiroshi 2012-10-13 02:09:34 +09:00
parent c66f32e4ab
commit b2a90224d6
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/tabbarDNDObserver.js
View File

@ -263,6 +263,31 @@ catch(e) {
event : aEvent event : aEvent
}; };
/**
* Even if a dragover tab is moved by CSS "transform",
* the event is fired based on its original position.
* Following tabs can be transformed, and we'll see far
* tab (visually it is far but logically it is below the
* pointer!) as the drop target.
* "animDropIndex" is calculated based on their visual
* positions, and we can use it to calculate the drop target
* which is visually below the pointer.
*/
let draggedTab = aEvent.dataTransfer && aEvent.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
if (draggedTab && draggedTab._dragData && 'animDropIndex' in draggedTab._dragData) {
let newIndex = draggedTab._dragData.animDropIndex;
/**
* Preceding tabs won't be transformed. We have to
* handle only following tabs.
*/
if (newIndex > draggedTab._tPos) {
newIndex--;
let tabs = sv.getAllTabs(b);
if (newIndex < tabs.length)
tab = tabs[newIndex];
}
}
var isTabMoveFromOtherWindow = aSourceTab && aSourceTab.ownerDocument != d; var isTabMoveFromOtherWindow = aSourceTab && aSourceTab.ownerDocument != d;
var isNewTabAction = !aSourceTab || aSourceTab.ownerDocument != d; var isNewTabAction = !aSourceTab || aSourceTab.ownerDocument != d;
@ -839,7 +864,8 @@ try{
sv.autoScroll.processAutoScroll(aEvent); sv.autoScroll.processAutoScroll(aEvent);
var dragOverTab = sv.getTabFromEvent(aEvent) || sv.getTabFromTabbarEvent(aEvent) || aEvent.target; let draggedTab = aEvent.dataTransfer && aEvent.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
let dragOverTab = sv.getTabFromEvent(aEvent) || sv.getTabFromTabbarEvent(aEvent) || aEvent.target;
b.ownerDocument.defaultView['piro.sakura.ne.jp'].tabsDragUtils b.ownerDocument.defaultView['piro.sakura.ne.jp'].tabsDragUtils
.processTabsDragging(aEvent, !dragOverTab || !dragOverTab.pinned); .processTabsDragging(aEvent, !dragOverTab || !dragOverTab.pinned);
@ -897,7 +923,6 @@ try{
let dropPosition = info.position == sv.kDROP_BEFORE ? 'before' : let dropPosition = info.position == sv.kDROP_BEFORE ? 'before' :
info.position == sv.kDROP_AFTER ? 'after' : info.position == sv.kDROP_AFTER ? 'after' :
'self'; 'self';
let draggedTab = aEvent.dataTransfer && aEvent.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
if (indicatorTab != draggedTab && if (indicatorTab != draggedTab &&
indicatorTab.getAttribute(sv.kDROP_POSITION) != dropPosition) { indicatorTab.getAttribute(sv.kDROP_POSITION) != dropPosition) {
this.clearDropPosition(); this.clearDropPosition();