Commit: e7e2b5dfd4b937977fe4a8e9b043312436cd2ebe - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: e7e2b5dfd4b937977fe4a8e9b043312436cd2ebe (tree)
• Time: 2007-05-14 02:38:44
• Author: h677 <h677>
• Commiter: h677

Log Message

レスポップアップ中のメニューのアクションを、そのスレッドで動作するように拡張

Change Summary

• modified: Giko.dfm
• modified: Giko.pas
• modified: HTMLCreate.pas
• modified: ResPopupBrowser.pas
• modified: gikoNavi.res

Incremental Difference

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -159,7 +159,7 @@ object GikoForm: TGikoForm
           object ToolBar1: TToolBar
             Left = 2
             Top = 4
-            Width = 15
+            Width = 16
             Height = 18
             Align = alNone
             AutoSize = True
@@ -971,7 +971,7 @@ object GikoForm: TGikoForm
           OnResize = AddressToolBarResize
           object AddressComboBox: TComboBox
             Left = 0
-            Top = 0
+            Top = 1
             Width = 177
             Height = 20
             DropDownCount = 20

--- a/Giko.pas
+++ b/Giko.pas
@@ -2209,6 +2209,9 @@ begin
 
 		Cancel := True;
 		GetCursorpos(p);
+        KokoPopupMenu.PopupComponent := nil;
+        if (Sender is TComponent) then
+            KokoPopupMenu.PopupComponent := TComponent(Sender);
 		KokoPopupMenu.Tag := StrToInt(sNo);
 		KokoPopupMenu.Popup(p.x, p.y);
 	end else if Pos('mailto', LowerCase(URL)) <> 0 then begin
@@ -2846,9 +2849,13 @@ end;
 function TGikoForm.GetActiveContent: TThreadItem;
 begin
 	try
-		if FActiveContent <> nil then
-			Result := FActiveContent.Thread
-		else
+		if FActiveContent <> nil then begin
+			Result := FActiveContent.Thread;
+            if (FResPopupBrowser <> nil) and (FResPopupBrowser.CurrentBrowser.Visible = True) then
+                if (FResPopupBrowser.CurrentBrowser.Thread <> nil) then begin
+                    Result := FResPopupBrowser.CurrentBrowser.Thread;
+                end;
+		end else
 			Result := nil;
 	except
 		Result := nil;
@@ -7110,7 +7117,6 @@ begin
 		if Assigned(firstElement) then
 			if firstElement.style.visibility <> 'hidden' then
 				firstElement.style.visibility := 'hidden';
-
 end;
 
 procedure TGikoForm.RepaintAllTabsBrowser();

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -1282,13 +1282,15 @@ begin
 
         Hint.Title := '';
         Hint.RawDocument := '';
-
+        Hint.Thread := nil;
+        
 		//ƒ^ƒCƒgƒ‹•\Ž¦
 		if Title then
 				if ThreadItem <> nil then
 					Hint.Title := ThreadItem.Title;
 
         if ThreadItem <> nil then begin
+            Hint.Thread := ThreadItem;
             ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
             ResLink.FKey := ChangeFileExt(ThreadItem.FileName, '');
             //if ThreadItem.IsBoardPlugInAvailable then begin

--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -2,7 +2,7 @@ unit ResPopupBrowser;
 interface
 uses
 	Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
-	ActiveX, OleCtrls, {HintWindow,}
+	ActiveX, OleCtrls, {HintWindow,} HTMLDocumentEvent, BoardGroup,
 {$IF Defined(DELPRO) }
 	SHDocVw,
 	MSHTML
@@ -22,10 +22,14 @@ type
         FTitle :String;
         FRawDocument: String;
    		FPopupType: TGikoPopupType;
+		FEvent: THTMLDocumentEventSink;//ƒuƒ‰ƒEƒUƒhƒLƒ…ƒƒ“ƒgƒCƒxƒ“ƒg
+        FThread: TThreadItem;
         function GetBodyStyle(OnlyTitle: Boolean = False): string;
         function GetWindowHeight : Integer;
         function GetTitle(OnlyTitle: Boolean): string;
 		function CalcRect(MaxHeight: Integer; MaxWidth: Integer; Scroll: Boolean): TRect;
+        function ResPopupBrowserClick(Sender: TObject): WordBool;
+        function GetThread: TThreadItem;
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 	public
@@ -35,6 +39,7 @@ type
         property ParentBrowser:TResPopupBrowser read FParentBrowser write FParentBrowser;
         property Title: String read FTitle write FTitle;
         property RawDocument: String read FRawDocument write FRawDocument;
+        property Thread: TThreadItem read GetThread write FThread;
         function CreateNewBrowser: TResPopupBrowser;
         function CurrentBrowser: TResPopupBrowser;
         procedure Write(ADocument: String; OnlyTitle: Boolean = False);
@@ -47,7 +52,7 @@ type
 	end;
 
 implementation
-uses MojuUtils, GikoSystem, Setting, Giko;
+uses MojuUtils, GikoSystem, Setting, Giko, GikoDataModule;
 
 
 constructor TResPopupBrowser.Create(AOwner: TComponent);
@@ -103,7 +108,7 @@ end;
 function TResPopupBrowser.CurrentBrowser: TResPopupBrowser;
 begin
     Result := Self.CreateNewBrowser;
-    if (Result.Parent <> nil) then
+    if (Result.ParentBrowser <> nil) then
         Result := Result.ParentBrowser;
 end;
 procedure TResPopupBrowser.NavigateBlank;
@@ -128,6 +133,7 @@ procedure TResPopupBrowser.Write(ADocument: String; OnlyTitle: Boolean = False);
 var
     doc: Variant;
    	ARect: TRect;
+    FDispHtmlDocument: DispHTMLDocument;
 begin
     Self.OnStatusTextChange := nil;
     try
@@ -154,7 +160,9 @@ begin
                 (ARect.Right - ARect.Left) ,
                 (ARect.Bottom - ARect.Top),
                 SWP_NOACTIVATE or SWP_HIDEWINDOW);
-
+            FDispHtmlDocument := Idispatch(OleVariant(Self.ControlInterface).Document) as DispHTMLDocument;
+            FEvent := THTMLDocumentEventSink.Create(Self, FDispHtmlDocument, HTMLDocumentEvents2);
+            FEvent.OnClick := ResPopupBrowserClick;
             ShowWindow(Self.Handle, SW_SHOWNOACTIVATE);
             Self.Visible := True;
         except
@@ -207,6 +215,8 @@ begin
     if (Self.Visible) then begin
         Self.Title := '';
         Self.RawDocument := '';
+        Self.FThread := nil;
+        FEvent.Free;
         NavigateBlank;
         ShowWindow(Self.Handle, SW_HIDE);
         Self.Visible := False;
@@ -295,4 +305,23 @@ begin
     except
     end;
 end;
+function TResPopupBrowser.ResPopupBrowserClick(Sender: TObject): WordBool;
+begin
+    Result := True;
+end;
+function TResPopupBrowser.GetThread: TThreadItem;
+begin
+    Result := nil;
+    if (FThread <> nil) then begin
+        try
+            // –³Œø‚ȃ|ƒCƒ“ƒ^ŒŸ¸
+            if (FThread.ParentBoard <> nil) then begin
+                Result := FThread
+            end;
+        except
+            //–³Œø‚ȃ|ƒCƒ“ƒ^‚¾‚Á‚½
+            Result := nil;
+        end;
+    end;
+end;
 end.

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