From 4578c676a4561497b4a88f65b4228d04d388a4a9 Mon Sep 17 00:00:00 2001
From: yoffy <yoffy>
Date: Wed, 24 Sep 2003 07:58:23 +0000
Subject: [PATCH] =?utf8?q?=E3=83=BB=E3=83=AC=E3=82=B9=E7=95=AA=E3=81=AB?=
 =?utf8?q?=E3=81=9F=E3=81=84=E3=81=99=E3=82=8B=E3=83=A1=E3=83=8B=E3=83=A5?=
 =?utf8?q?=E3=83=BC=E3=82=92=E3=80=8Cgiko:=E3=80=8D=E3=81=8B=E3=82=89?=
 =?utf8?q?=E3=80=8Cmenu:=E3=80=8D=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82=20?=
 =?utf8?q?=E3=83=BB=E3=82=B9=E3=83=AC=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AE?=
 =?utf8?q?=E3=83=9B=E3=82=A4=E3=83=BC=E3=83=AB=E3=81=A7=E6=A8=AA=E3=82=B9?=
 =?utf8?q?=E3=82=AF=E3=83=AD=E3=83=BC=E3=83=AB=E3=82=82=E8=80=83=E6=85=AE?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Giko.dfm |  4 ++--
 Giko.pas | 28 +++++++++++-----------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/Giko.dfm b/Giko.dfm
index 6fb68c1..d1752ec 100644
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,6 +1,6 @@
 object GikoForm: TGikoForm
-  Left = 163
-  Top = 263
+  Left = 161
+  Top = 224
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False
diff --git a/Giko.pas b/Giko.pas
index 2d11cb4..f98e8eb 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -2413,25 +2413,15 @@ procedure TGikoForm.BrowserBeforeNavigate2(Sender: TObject;
 	const pDisp: IDispatch; var URL, Flags, TargetFrameName, PostData,
 	Headers: OleVariant; var Cancel: WordBool);
 var
-	Sep: TSysCharSet;
-	Whi: TSysCharSet;
-	SList: TStringList;
-	s: string;
 	sNo: string;
 	p: TPoint;
+const
+	kMenuName: string = 'menu:';
 begin
-	s := URL;
-//	if Pos('giko://kokomade/?no=', s) <> 0 then begin
-	if Pos('giko://', s) <> 0 then begin
-		SList := TStringList.Create;
-		try
-			Sep := ['?', '&'];
-			Whi := [];
-			ExtractHTTPFields(Sep, Whi, PChar(s), SList, False);
-			sNo := SList.Values['no'];
-		finally
-			SList.Free;
-		end;
+
+	if Pos(kMenuName, URL) <> 0 then begin
+  	sNo := Copy( URL, Pos( kMenuName, URL ) + Length( kMenuName ), Length( URL ) );
+    
 		if not GikoSys.IsNumeric(sNo) then Exit;
 
 		Cancel := True;
@@ -2441,6 +2431,7 @@ begin
 	end else if Pos('mailto', LowerCase(URL)) <> 0 then begin
 		Cancel := not GikoSys.Setting.OpenMailer;
 	end;
+
 end;
 
 procedure TGikoForm.ListViewAdvancedCustomDrawItem(Sender: TCustomListView;
@@ -6730,7 +6721,10 @@ begin
 		 (Wnd = BrowserTab.Parent.Handle) then begin
 		BrowserTab.ScrollTabs(Delta);
 	end else if Wnd = ListView.Handle then begin
-		ListView.Scroll( 0, Delta * 30 );
+  	if ListView.ViewStyle = vsList then
+			ListView.Scroll( Delta * 30, 0 )
+		else
+			ListView.Scroll( 0, Delta * 30 );
 	end else begin
 		Handled := False;
 	end;
-- 
2.11.0