提交: 13337ef9e1f1168799d2935fbff106a32f3e95db - gikonavi (git)

ギコナビ

Commit MetaInfo

• 修订版: 13337ef9e1f1168799d2935fbff106a32f3e95db (tree)
• 时间: 2009-05-05 20:32:22
• 作者: h677 <h677>
• Commiter: h677

Log Message

close #16508
画像プレビューをダブルクリックで消せるように対応。
プレビューウィンドウを消すメッセージをレスポップアップと共通化した。

更改概述

• modified: Giko.pas
• modified: Preview.pas
• modified: ResPopupBrowser.pas

差异

--- a/Giko.pas
+++ b/Giko.pas
@@ -24,8 +24,7 @@ uses
 const
 	NGWORDNAME_PANEL = 3;
 	THREADSIZE_PANEL = 2;
-    USER_RESPOPUPCLEAR		= WM_USER + 2005;	///< wParam : TWebBrowser
-    	
+    USER_POPUPCLEAR		= WM_USER + 2005;	///< wParam : TWebBrowser
 type
 
 	TToolBarSettingSenderType = (tssNone, tssMain, tssList, tssBrowser);
@@ -4918,12 +4917,16 @@ begin
 				senderBrowser := TWebBrowser( Message.WParam );
 				BrowserDocumentComplete( senderBrowser, senderBrowser.Parent, url );
 			end;
-        USER_RESPOPUPCLEAR:
+        USER_POPUPCLEAR:
             if (TObject(Message.WParam) is TResPopupBrowser) then begin
                 try
     				TResPopupBrowser( Message.WParam ).Clear;
                 except
                 end;
+			end else if (TObject(Message.WParam) is TPreviewBrowser) then begin
+                if FPreviewBrowser <> nil then begin
+            		ShowWindow(FPreviewBrowser.Handle, SW_HIDE);
+                end;
 			end;
 		end;
 

--- a/Preview.pas
+++ b/Preview.pas
@@ -3,17 +3,23 @@ unit Preview;
 interface
 uses
 	Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
-	ActiveX, 
+	ActiveX, OleCtrls, HTMLDocumentEvent,
 {$IF Defined(DELPRO) }
-	SHDocVw
+	SHDocVw,
+	MSHTML
 {$ELSE}
-	SHDocVw_TLB
+	SHDocVw_TLB,
+	MSHTML_TLB
 {$IFEND}
 ;
 type
 	TPreviewBrowser = class(TWebBrowser)
 	private
+        FEvent: THTMLDocumentEventSink;//ƒuƒ‰ƒEƒUƒhƒLƒ…ƒƒ“ƒgƒCƒxƒ“ƒg
         function makeHTML(const URL, Host, Document : String): String;
+        procedure BrowserDocumentComplete(Sender: TObject;
+	            const pDisp: IDispatch; var URL: OleVariant);
+        function PreviewDbClick(Sender: TObject): WordBool;
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 	public
@@ -24,7 +30,7 @@ type
 	end;
 
 implementation
-uses MojuUtils, GikoSystem, Setting;
+uses MojuUtils, GikoSystem, Setting, Giko;
 
 const
 	//ƒvƒŒƒrƒ…[ƒtƒ@ƒCƒ‹–¼
@@ -37,10 +43,15 @@ const
 constructor TPreviewBrowser.Create(AOwner: TComponent);
 begin
 	inherited Create(AOwner);
+    FEvent := nil;
+    OnDocumentComplete := BrowserDocumentComplete;
 end;
 
 destructor TPreviewBrowser.Destroy;
 begin
+    if (FEvent <> nil) then begin
+        FreeAndNil(FEvent);
+    end;
 	inherited Destroy;
 end;
 
@@ -201,4 +212,25 @@ begin
 				+ '</body></html>';
     end;
 end;
+//! ƒhƒLƒ…ƒƒ“ƒgŠ®—¹ƒCƒxƒ“ƒg
+procedure TPreviewBrowser.BrowserDocumentComplete(Sender: TObject;
+    const pDisp: IDispatch; var URL: OleVariant);
+begin
+    if (URL <> 'about:blank') then begin
+        FEvent := THTMLDocumentEventSink.Create(Self, Self.OleObject.Document,
+            HTMLDocumentEvents2);
+        FEvent.OnDoubleClick := PreviewDbClick;
+    end else begin
+        if (FEvent <> nil) then begin
+            FreeAndNil(FEvent);
+        end;
+    end;
+end;
+function TPreviewBrowser.PreviewDbClick(Sender: TObject): WordBool;
+begin
+    // Ž©•ª‚ÅŽ©•ª‚͏Á‚¹‚È‚¢‚̂ŁAƒƒbƒZ[ƒWŒo—R‚ŏÁ‚µ‚Ä‚à‚炤
+    PostMessage( GikoForm.Handle , USER_POPUPCLEAR, Integer( Self ), 0 );
+    Result := True;
+end;
+
 end.

--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -462,7 +462,7 @@ begin
     // ƒMƒRƒiƒr‚̃tƒH[ƒJƒX‚ð’D‚Á‚Ä‚é‚̂ŃtƒH[ƒ€‚É–³—‚â‚è•Ô‚·
     Blur;
     // Ž©•ª‚ÅŽ©•ª‚͏Á‚¹‚È‚¢‚̂ŁAƒƒbƒZ[ƒWŒo—R‚ŏÁ‚µ‚Ä‚à‚炤
-    PostMessage( GikoForm.Handle , USER_RESPOPUPCLEAR, Integer( Self ), 0 );
+    PostMessage( GikoForm.Handle , USER_POPUPCLEAR, Integer( Self ), 0 );
     Result := True;
 end;
 initialization