From b9047cd45c8dee99e06b073d5e6cafa0a8488932 Mon Sep 17 00:00:00 2001
From: h677 <h677>
Date: Fri, 29 Dec 2006 13:04:04 +0000
Subject: [PATCH] =?utf8?q?=E3=83=96=E3=83=A9=E3=82=A6=E3=82=B6=E3=82=BF?=
 =?utf8?q?=E3=83=96=E3=81=AED&D=E3=82=92=E3=81=99=E3=81=B9=E3=81=A6?=
 =?utf8?q?=E3=81=AE=E3=82=BF=E3=83=96=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB?=
 =?utf8?q?=E3=81=AB=E6=8B=A1=E5=BC=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Giko.dfm     |   4 ++--
 Giko.pas     |  38 +++++++++++++++-----------------------
 gikoNavi.res | Bin 4292 -> 4292 bytes
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/Giko.dfm b/Giko.dfm
index 5cf7ae3..2477d92 100644
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -159,7 +159,7 @@ object GikoForm: TGikoForm
           object ToolBar1: TToolBar
             Left = 2
             Top = 4
-            Width = 16
+            Width = 15
             Height = 18
             Align = alNone
             AutoSize = True
@@ -971,7 +971,7 @@ object GikoForm: TGikoForm
           OnResize = AddressToolBarResize
           object AddressComboBox: TComboBox
             Left = 0
-            Top = 1
+            Top = 0
             Width = 177
             Height = 20
             DropDownCount = 20
diff --git a/Giko.pas b/Giko.pas
index 14a6efb..98f3338 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -4170,6 +4170,7 @@ procedure TGikoForm.BrowserTabDragDrop(Sender, Source: TObject; X,
 var
 	idx: Integer;
 begin
+    FDragWFirst := False;
 	idx := BrowserTab.IndexOfTabAt(X, Y);
 	if idx <> -1 then
 		BrowserTab.Tabs.Move(BrowserTab.TabIndex, idx);
@@ -4184,14 +4185,11 @@ begin
 
 	TabIdx := BrowserTab.IndexOfTabAt(x, y);
 
-	if ( ssLeft in Shift ) and ( BrowserTab.Style = tsTabs ) then begin
-		if FDragWFirst = false then begin
-			FDragWFirst := true;
-		end else begin
+	if ( ssLeft in Shift ) then begin
+        if (FDragWFirst) then begin
 			BrowserTab.EndDrag(false);
 			BrowserTab.BeginDrag(false, DandD_THRESHOLD);
-			FDragWFirst := false;
-		end;
+        end;
 	end else begin
 		BrowserTab.EndDrag(false);
 		FDragWFirst := false;
@@ -6284,24 +6282,18 @@ end;
 procedure TGikoForm.BrowserTabMouseUp(Sender: TObject;
 	Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
-	if FDragWFirst <> true then begin
+	if FDragWFirst = true then
 		FDragWFirst := false;
-{
-	end else if (abs( X - FMouseDownPos.X ) < Mouse.DragThreshold)
-	and (abs( Y - FMouseDownPos.Y ) < Mouse.DragThreshold) then begin
-(*}
-	end else begin
-//*)
-		if GikoSys.Setting.ListOrientation = gloHorizontal then begin
-			if GikoSys.Setting.ListWidthState = glsMin then begin
-				GikoDM.BrowserMaxAndFocusAction.Execute;
-			end;
-		end else begin
-			if GikoSys.Setting.ListHeightState = glsMin then begin
-				GikoDM.BrowserMaxAndFocusAction.Execute;
-			end;
- 		end;
-	end;
+
+    if GikoSys.Setting.ListOrientation = gloHorizontal then begin
+        if GikoSys.Setting.ListWidthState = glsMin then begin
+            GikoDM.BrowserMaxAndFocusAction.Execute;
+        end;
+    end else begin
+        if GikoSys.Setting.ListHeightState = glsMin then begin
+            GikoDM.BrowserMaxAndFocusAction.Execute;
+        end;
+    end;
 end;
 
 procedure TGikoForm.LinkToolBarDragOver(Sender, Source: TObject; X,
diff --git a/gikoNavi.res b/gikoNavi.res
index 89c467c1fc74527b3b3b67c1e479e184ca3851dd..0d5bd10f0a10efffc9764db02f9b423311f7e34f 100644
GIT binary patch
delta 28
kcmX@2ctml-8(z+JObiTW42%rxCV%Dq%V@UwGv7r<0F$l?VE_OC

delta 28
kcmX@2ctml-8(z+}ObiTW42%qGCx7Mr%V@g!Gv7r<0F#IcUH||9

-- 
2.11.0