WebTabのD&Dの調整

diff --git a/Giko.dfm b/Giko.dfm
index 348c31d..03410b0 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,6 +1,6 @@
 object GikoForm: TGikoForm
-  Left = 384
-  Top = 277
+  Left = 626
+  Top = 239
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False

diff --git a/Giko.pas b/Giko.pas
index c8d2973..0931bfe 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -844,8 +844,10 @@ type
     FDropSpaceNode: TTreeNode;
 
 
-        FDragTime : Cardinal;  //\83\8a\83\93\83N\82ÌD&D\97p\82É\8e\9e\8aÔ\95Û\91¶\97p
+        FDragTime : Cardinal;  //\83\8a\83\93\83N\82ÌD&D\97p
         FDragButton : TToolButton;     //\83\8a\83\93\83N\82ÌD&D\97p\82ÉDrag\82µ\82Ä\82éButton\95Û\91¶
+        FDragWFirst : Boolean; //WebTab\82ÌD&D\97p
+        FDragWTabName : Integer;  //WebTab\82ÌD&D\97p
 
                procedure SetBoardTreeNode;
                function SetCategoryListItem(ABBS2ch: TBBS2ch): Integer;
@@ -5158,8 +5160,18 @@ var
        ThreadItem: TThreadItem;
 begin
        if ( ssLeft in Shift )then begin
-        BrowserTab.EndDrag(false);
-        BrowserTab.BeginDrag(false, DandD_THRESHOLD);
+        if not FDragWFirst then begin
+               FDragWFirst := true;
+            FDragWTabName := BrowserTab.IndexOfTabAt(x, y);
+        end else begin
+               if BrowserTab.IndexOfTabAt(x, y) <> FDragWTabName then begin
+                       BrowserTab.EndDrag(false);
+                       BrowserTab.BeginDrag(false, DandD_THRESHOLD);
+                FDragWFirst := false;
+            end;
+        end;
+    end else begin
+           FDragWFirst := true;
     end;
        TabIdx := BrowserTab.IndexOfTabAt(x, y);
        if (FTabHintIndex <> TabIdx) and (TabIdx <> -1) then begin