提交: 6f58ca257654b388576b2959499c3d514dc0f3c4 - gikonavi (git)

ギコナビ

Commit MetaInfo

• 修订版: 6f58ca257654b388576b2959499c3d514dc0f3c4 (tree)
• 时间: 2007-06-10 23:20:06
• 作者: h677 <h677>
• Commiter: h677

Log Message

他のスレッドへのリンクをポップアップ中に、現在スレッドのダウンロードなどを
実行するとポップアップしているスレッドをダウンロードするなどの不具合の解消

更改概述

• modified: Giko.pas
• modified: GikoDataModule.pas
• modified: gikoNavi.res

差异

--- a/Giko.pas
+++ b/Giko.pas
@@ -725,7 +725,7 @@ type
 		property ActiveBBS : TBBS read FActiveBBS write FActiveBBS;
 		property WorkCount: Integer read FWorkCount write FWorkCount;
 		procedure SetContent(inThread: TBrowserRecord);
-		function GetActiveContent: TThreadItem;
+		function GetActiveContent(popup :Boolean = false): TThreadItem;
 		function GetActiveList: TObject;
 
 		procedure SetListViewType(AViewType: TGikoViewType); overload;
@@ -2853,12 +2853,13 @@ begin
 	end;
 end;
 
-function TGikoForm.GetActiveContent: TThreadItem;
+function TGikoForm.GetActiveContent(popup :Boolean = false): TThreadItem;
 begin
 	try
 		if FActiveContent <> nil then begin
 			Result := FActiveContent.Thread;
-            if (FResPopupBrowser <> nil) and (FResPopupBrowser.CurrentBrowser.Visible = True) then
+            if (popup) and
+                (FResPopupBrowser <> nil) and (FResPopupBrowser.CurrentBrowser.Visible = True) then
                 if (FResPopupBrowser.CurrentBrowser.Thread <> nil) then begin
                     Result := FResPopupBrowser.CurrentBrowser.Thread;
                 end;
@@ -6178,7 +6179,7 @@ var
 	boardPlugIn : TBoardPlugIn;
 begin
 	if Number = 0 then Exit;
-	ThreadItem := GetActiveContent;
+	ThreadItem := GetActiveContent(True);
 
 	if ThreadItem <> nil then begin
 		//if ThreadItem.IsBoardPlugInAvailable then begin
@@ -7047,7 +7048,7 @@ var
 	ReadList		: TStringList;
 	wordCount		: TWordCount;
 begin
-	ThreadItem 	:= GetActiveContent;
+	ThreadItem 	:= GetActiveContent(True);
 	ReadList		:= TStringList.Create;
 	wordCount		:= TWordCount.Create;
 	try
@@ -7081,7 +7082,7 @@ var
 begin
 	No := KokoPopupMenu.Tag;
 	if No = 0 then Exit;
-	ThreadItem := GetActiveContent;
+	ThreadItem := GetActiveContent(True);
 	if ThreadItem = nil then Exit;
 	body := TStringList.Create;
 	try

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -2336,7 +2336,7 @@ var
 begin
 	No := GikoForm.KokoPopupMenu.Tag;
 	if No = 0 then Exit;
-	ThreadItem := GikoForm.GetActiveContent;
+	ThreadItem := GikoForm.GetActiveContent(True);
 	if ThreadItem = nil then Exit;
 	ThreadItem.Kokomade := No;
 	GikoForm.ActiveContent.Thread.ScrollTop :=
@@ -2353,7 +2353,7 @@ procedure TGikoDM.ZenbuActionExecute(Sender: TObject);
 var
 	ThreadItem: TThreadItem;
 begin
-	ThreadItem := GikoForm.GetActiveContent;
+	ThreadItem := GikoForm.GetActiveContent(True);
 	if ThreadItem = nil then Exit;
 	ThreadItem.Kokomade := -1;
 	GikoForm.ActiveContent.Thread.ScrollTop :=
@@ -2374,7 +2374,7 @@ var
 begin
 	Number := GikoForm.KokoPopupMenu.Tag;
 	if Number = 0 then Exit;
-	Item := GikoForm.GetActiveContent;
+	Item := GikoForm.GetActiveContent(True);
 	if Item = nil then Exit;
 
 	Editor := TEditorForm.Create(GikoForm);
@@ -2404,7 +2404,7 @@ var
 begin
 	No := GikoForm.KokoPopupMenu.Tag;
 	if No = 0 then Exit;
-	ThreadItem := GikoForm.GetActiveContent;
+	ThreadItem := GikoForm.GetActiveContent(True);
 	if ThreadItem = nil then Exit;
 	count := GikoSys.GetSameIDResCount(No, GikoForm.ActiveContent.Thread);
 	limited := LIMIT;
@@ -2446,7 +2446,7 @@ var
 begin
 	IndividualForm := TIndividualAbonForm.Create(GikoForm);
 	try
-		ThreadItem := GikoForm.GetActiveContent;
+		ThreadItem := GikoForm.GetActiveContent(True);
 		ThreadItem.ScrollTop :=
 			OleVariant(IHTMLDocument2(GikoForm.ActiveContent.Browser.Document)).Body.ScrollTop;
 		if (ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
@@ -2494,7 +2494,7 @@ var
 begin
 	IndividualForm := TIndividualAbonForm.Create(GikoForm);
 	try
-		ThreadItem := GikoForm.GetActiveContent;
+		ThreadItem := GikoForm.GetActiveContent(True);
 		ThreadItem.ScrollTop :=
 			OleVariant(IHTMLDocument2(GikoForm.ActiveContent.Browser.Document)).Body.ScrollTop;
 		if (ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin

Binary files a/gikoNavi.res and b/gikoNavi.res differ