From 187937818dc6e34a967826c90d1884864cc79f14 Mon Sep 17 00:00:00 2001
From: h677 <h677>
Date: Tue, 29 Nov 2005 14:51:23 +0000
Subject: [PATCH] =?utf8?q?=E3=82=AD=E3=83=A3=E3=83=93=E3=83=8D=E3=83=83?=
 =?utf8?q?=E3=83=88=E3=81=AE=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E3=82=A4?=
 =?utf8?q?=E3=83=99=E3=83=B3=E3=83=88=E3=81=A8=E3=83=80=E3=83=96=E3=83=AB?=
 =?utf8?q?=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E3=82=A4=E3=83=99=E3=83=B3?=
 =?utf8?q?=E3=83=88=E3=81=AE=E6=8A=91=E5=88=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Giko.pas     |  39 ++++++++++++++++++++++++++++++---------
 gikoNavi.res | Bin 4292 -> 4292 bytes
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/Giko.pas b/Giko.pas
index 33956dd..9f393a6 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -2240,9 +2240,18 @@ end;
 //! ƒcƒŠ[ƒrƒ…[‚̃_ƒuƒ‹ƒNƒŠƒbƒNƒCƒxƒ“ƒg
 // *************************************************************************
 procedure TGikoForm.TreeViewDblClick(Sender: TObject);
+var
+	pos : TPoint;
+	rect: TRect;
 begin
-	if (FClickNode = TreeView.Selected) then begin
-		TreeDoubleClick( FClickNode );
+	pos := FMouseDownPos;
+	if (FClickNode = TreeView.GetNodeAt(pos.X, pos.Y)) then begin
+		//ƒ}ƒEƒX‚ªnode‚̏ã‚É‚¢‚é‚©
+		rect := FClickNode.DisplayRect(true);
+		if ((rect.Left <= pos.X) and (rect.Right >= pos.X)) and
+			((rect.Bottom >= pos.Y) and (rect.Top <= pos.Y)) then begin
+			TreeDoubleClick( FClickNode );
+		end;
 	end;
 end;
 
@@ -6210,10 +6219,19 @@ end;
 //! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃_ƒuƒ‹ƒNƒŠƒbƒNƒCƒxƒ“ƒg
 // *************************************************************************
 procedure TGikoForm.FavoriteTreeViewDblClick(Sender: TObject);
+var
+	pos : TPoint;
+	rect: TRect;
 begin
 	//ƒNƒŠƒbƒNŽž‚Ì‘I‘ðƒCƒxƒ“ƒg‚Æ“¯‚¶‚È‚çƒ_ƒuƒ‹ƒNƒŠƒbƒNŽÀs
-	if (FClickNode = FavoriteTreeView.Selected) then begin
-		GikoDM.FavoriteTreeViewReloadActionExecute( Sender );
+	pos := FMouseDownPos;
+	if (FClickNode = FavoriteTreeView.GetNodeAt(pos.X, pos.Y)) then begin
+		//ƒ}ƒEƒX‚ªnode‚̏ã‚É‚¢‚é‚©
+		rect := FClickNode.DisplayRect(true);
+		if ((rect.Left <= pos.X) and (rect.Right >= pos.X)) and
+			((rect.Bottom >= pos.Y) and (rect.Top <= pos.Y)) then begin
+			GikoDM.FavoriteTreeViewReloadActionExecute( Sender );
+		end;
 	end;
 end;
 
@@ -6650,6 +6668,7 @@ end;
 procedure TGikoForm.TreeViewClick(Sender: TObject);
 begin
 	FClickNode := TreeView.Selected;
+	FMouseDownPos := TreeView.ScreenToClient(Mouse.CursorPos);
 end;
 procedure TGikoForm.TreeViewKeyDown(Sender: TObject; var Key: Word;
 	Shift: TShiftState);
@@ -6672,13 +6691,12 @@ var
 begin
 
 	case Button of
-	{mbLeft:
+{	mbLeft:
 		begin
 			FMouseDownPos.X := X;
 			FMouseDownPos.Y := Y;
 		end;
-	}
-	mbMiddle:
+}	mbMiddle:
 		begin
 			favItem := FavoriteTreeView.GetNodeAt( X, Y );
 			if favItem = nil then Exit;
@@ -6742,7 +6760,7 @@ procedure TGikoForm.FavoriteTreeViewMouseUp(Sender: TObject;
   Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
 	if (Button = mbLeft) and not (ssDouble	in Shift) then begin
-		if (FClickNode = FavoriteTreeView.Selected) then begin
+		if (FClickNode = FavoriteTreeView.GetNodeAt(X, Y)) then begin
 			FavoriteClick( TObject( FClickNode ) );
 		end;
 	end;
@@ -7627,6 +7645,7 @@ procedure TGikoForm.FavoriteTreeViewClick(Sender: TObject);
 begin
 	//Œ»Ý‘I‘ð‚³‚ê‚Ä‚¢‚éƒAƒCƒeƒ€‚ð•Û‘¶
 	FClickNode := FavoriteTreeView.Selected;
+	FMouseDownPos := FavoriteTreeView.ScreenToClient(Mouse.CursorPos);
 end;
 // *************************************************************************
 //! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃AƒCƒeƒ€‚̏k¬ŽžƒCƒxƒ“ƒg
@@ -7669,7 +7688,9 @@ procedure TGikoForm.TreeViewMouseUp(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);
 begin
 	if (Button = mbLeft) and not (ssDouble in Shift) then begin
-		if (FClickNode = TreeView.Selected) then begin
+
+		if (FClickNode = TreeView.GetNodeAt(X, Y)) then begin
+		//if (FClickNode = TreeView.Selected) then begin
 			TreeClick(FClickNode);
 		end;
 	end;
diff --git a/gikoNavi.res b/gikoNavi.res
index 59be6a3e02bfc79dd866caaef8ff7a1d16d036ce..39b5ee91fa99bb905abac55eafe61e416b36cc8b 100644
GIT binary patch
delta 28
kcmX@2ctml-8(z+QCI$v$21bVb$zOT@G8%9G%y*Fy0E>(X-2eap

delta 28
kcmX@2ctml-8(z*lCI$v$21bUw$zOT@G8%3E%y*Fy0E=b`+5i9m

-- 
2.11.0