#6810 Result tabs DnD support + panel tabs DnD.

plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/control/DashboardList.java

@@ -21,9 +21,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.*;
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -300,6 +298,10 @@ public class DashboardList extends Composite implements DashboardGroupContainer
                     event.doit = false;
                 } else {
                     Rectangle columnBounds = selectedItem.getBounds();
+                    if (dragImage != null) {
+                        dragImage.dispose();
+                        dragImage = null;
+                    }
                     GC gc = new GC(DashboardList.this);
                     dragImage = new Image(Display.getCurrent(), columnBounds.width, columnBounds.height);
                     gc.copyArea(

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java

@@ -4482,6 +4482,10 @@ public abstract class LightGrid extends Canvas {
                         event.doit = false;
                         return;
                     }
+                    if (dragImage != null) {
+                        dragImage.dispose();
+                        dragImage = null;
+                    }
                     GC gc = new GC(LightGrid.this);
                     dragImage = new Image(Display.getCurrent(), columnBounds.width, columnBounds.height);
                     gc.copyArea(

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java

@@ -81,6 +81,7 @@ import org.jkiss.dbeaver.tools.transfer.registry.DataTransferNodeDescriptor;
 import org.jkiss.dbeaver.tools.transfer.registry.DataTransferProcessorDescriptor;
 import org.jkiss.dbeaver.tools.transfer.registry.DataTransferRegistry;
 import org.jkiss.dbeaver.ui.*;
+import org.jkiss.dbeaver.ui.controls.TabFolderReorder;
 import org.jkiss.dbeaver.ui.controls.ToolbarSeparatorContribution;
 import org.jkiss.dbeaver.ui.controls.VerticalButton;
 import org.jkiss.dbeaver.ui.controls.VerticalFolder;
@@ -274,6 +275,7 @@ public class ResultSetViewer extends Viewer
             if (supportsPanels) {
                 this.panelFolder = new CTabFolder(this.viewerSash, SWT.FLAT | SWT.TOP);
                 CSSUtils.setCSSClass(panelFolder, DBStyles.COLORED_BY_CONNECTION_TYPE);
+                new TabFolderReorder(panelFolder);
                 this.panelFolder.marginWidth = 0;
                 this.panelFolder.marginHeight = 0;
                 this.panelFolder.setMinimizeVisible(true);

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java

@@ -89,10 +89,7 @@ import org.jkiss.dbeaver.tools.transfer.IDataTransferProducer;
 import org.jkiss.dbeaver.tools.transfer.database.DatabaseTransferProducer;
 import org.jkiss.dbeaver.tools.transfer.ui.wizard.DataTransferWizard;
 import org.jkiss.dbeaver.ui.*;
-import org.jkiss.dbeaver.ui.controls.CustomSashForm;
-import org.jkiss.dbeaver.ui.controls.StyledTextFindReplaceTarget;
-import org.jkiss.dbeaver.ui.controls.VerticalButton;
-import org.jkiss.dbeaver.ui.controls.VerticalFolder;
+import org.jkiss.dbeaver.ui.controls.*;
 import org.jkiss.dbeaver.ui.controls.resultset.*;
 import org.jkiss.dbeaver.ui.controls.resultset.internal.ResultSetMessages;
 import org.jkiss.dbeaver.ui.css.CSSUtils;
@@ -874,6 +871,7 @@ public class SQLEditor extends SQLEditorBase implements
     {
         resultTabs = new CTabFolder(resultsSash, SWT.TOP | SWT.FLAT);
         CSSUtils.setCSSClass(resultTabs, DBStyles.COLORED_BY_CONNECTION_TYPE);
+        new TabFolderReorder(resultTabs);
         resultTabs.setLayoutData(new GridData(GridData.FILL_BOTH));
         resultTabs.addSelectionListener(new SelectionAdapter() {
             @Override

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/TabFolderReorder.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jkiss.dbeaver.ui.controls;
+
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.dnd.*;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.jkiss.dbeaver.ui.dnd.LocalObjectTransfer;
+
+/**
+ * TabFolderReorder
+ */
+public class TabFolderReorder
+{
+    private CTabItem dragItem;
+
+    public TabFolderReorder(CTabFolder folder) {
+        final DragSource source = new DragSource(folder, DND.DROP_MOVE);
+        source.setTransfer(TabTransfer.INSTANCE);
+        source.addDragListener (new DragSourceListener() {
+            private Image dragImage;
+            @Override
+            public void dragStart(DragSourceEvent event) {
+                Point point = folder.toControl(folder.getDisplay().getCursorLocation());
+                dragItem = folder.getItem(point);
+
+                if (dragItem == null) {
+                    return;
+                }
+                Rectangle columnBounds = dragItem.getBounds();
+                if (dragImage != null) {
+                    dragImage.dispose();
+                    dragImage = null;
+                }
+                GC gc = new GC(folder);
+                dragImage = new Image(Display.getCurrent(), columnBounds.width, columnBounds.height);
+                gc.copyArea(
+                    dragImage,
+                    columnBounds.x,
+                    columnBounds.y);
+                event.image = dragImage;
+                gc.dispose();
+            }
+
+            @Override
+            public void dragSetData (DragSourceEvent event) {
+                event.data = dragItem;
+            }
+            @Override
+            public void dragFinished(DragSourceEvent event) {
+                if (dragImage != null) {
+                    dragImage.dispose();
+                    dragImage = null;
+                }
+            }
+        });
+
+        DropTarget dropTarget = new DropTarget(folder, DND.DROP_MOVE);
+        dropTarget.setTransfer(TabTransfer.INSTANCE, TextTransfer.getInstance());
+        dropTarget.addDropListener(new DropTargetListener() {
+            @Override
+            public void dragEnter(DropTargetEvent event)
+            {
+                handleDragEvent(event);
+            }
+
+            @Override
+            public void dragLeave(DropTargetEvent event)
+            {
+                handleDragEvent(event);
+            }
+
+            @Override
+            public void dragOperationChanged(DropTargetEvent event)
+            {
+                handleDragEvent(event);
+            }
+
+            @Override
+            public void dragOver(DropTargetEvent event)
+            {
+                handleDragEvent(event);
+            }
+
+            @Override
+            public void drop(DropTargetEvent event)
+            {
+                handleDragEvent(event);
+                if (event.detail == DND.DROP_MOVE) {
+                    moveTabs(folder, event);
+                }
+            }
+
+            @Override
+            public void dropAccept(DropTargetEvent event)
+            {
+                handleDragEvent(event);
+            }
+
+            private void handleDragEvent(DropTargetEvent event)
+            {
+                if (!isDropSupported(folder, event)) {
+                    event.detail = DND.DROP_NONE;
+                } else {
+                    event.detail = DND.DROP_MOVE;
+                }
+                event.feedback = DND.FEEDBACK_SELECT;
+            }
+
+            private boolean isDropSupported(CTabFolder folder, DropTargetEvent event)
+            {
+                if (dragItem == null) {
+                    return false;
+                }
+                Point point = folder.toControl(folder.getDisplay().getCursorLocation());
+                return folder.getItem(new Point(point.x, point.y)) != null;
+            }
+
+        });
+    }
+
+    private void moveTabs(CTabFolder folder, DropTargetEvent event) {
+        Point point = folder.toControl(folder.getDisplay().getCursorLocation());
+        CTabItem item = folder.getItem(new Point(point.x, point.y));
+        if (item != null && dragItem != null) {
+            Control dragControl = dragItem.getControl();
+            String dragText = dragItem.getText();
+            Image dragImage = dragItem.getImage();
+            Object dragData = dragItem.getData();
+
+            dragItem.setText(item.getText());
+            dragItem.setImage(item.getImage());
+            dragItem.setData(item.getData());
+            dragItem.setControl(item.getControl());
+
+            item.setText(dragText);
+            item.setImage(dragImage);
+            item.setData(dragData);
+            item.setControl(dragControl);
+
+            folder.setSelection(item);
+        }
+    }
+
+    public final static class TabTransfer extends LocalObjectTransfer<CTabItem> {
+
+        public static final TabTransfer INSTANCE = new TabTransfer();
+        private static final String TYPE_NAME = "TabTransfer.CTabItem Transfer" + System.currentTimeMillis() + ":" + INSTANCE.hashCode();//$NON-NLS-1$
+        private static final int TYPEID = registerType(TYPE_NAME);
+
+        private TabTransfer() {
+        }
+
+        @Override
+        protected int[] getTypeIds() {
+            return new int[] { TYPEID };
+        }
+
+        @Override
+        protected String[] getTypeNames() {
+            return new String[] { TYPE_NAME };
+        }
+
+    }
+
+}
\ No newline at end of file