When drag/dropping something in the middle, place it after the curren…

…t tab
sedwards2009 · Jun 15, 2017 · afaa1a5 · afaa1a5
1 parent a774369
commit afaa1a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/MainWebUi.ts b/src/MainWebUi.ts
@@ -344,9 +344,9 @@ export class MainWebUi extends ThemeableElementBase implements keybindingmanager
     const target = ev.target;
     if (target instanceof TabWidget) {
       if (detail.mimeType === ElementMimeType.MIMETYPE) {
-        this._handleElementDroppedEvent(target, target.getSelectedIndex(), detail.dropData);
+        this._handleElementDroppedEvent(target, target.getSelectedIndex() + 1, detail.dropData);
       } else if (detail.mimeType === FrameMimeType.MIMETYPE) {
-        this._handleFrameDroppedEvent(target, target.getSelectedIndex(), detail.dropData);
+        this._handleFrameDroppedEvent(target, target.getSelectedIndex() + 1, detail.dropData);
       }
     }
   }

diff --git a/src/SplitLayout.ts b/src/SplitLayout.ts
@@ -417,9 +417,7 @@ export class SplitLayout {
     const {tabWidgetInfo: sourceTabWidgetInfo, tabInfo} = findTabWidgetInfoByTab(this._rootInfoNode, tabElement);
     const targetTabWidgetInfo = findTabWidgetInfoByTabWidget(this._rootInfoNode, targetTabWidget);
 
-    if (tabIndex > targetTabWidgetInfo.children.length) {
-      return;
-    }
+    tabIndex = Math.min(tabIndex, targetTabWidgetInfo.children.length);
 
     if (sourceTabWidgetInfo === targetTabWidgetInfo) {
       const frontList = sourceTabWidgetInfo.children.slice(0, tabIndex).filter(kid => kid !== tabInfo);