Commit: c94d79bb131771c5f8823c8bce21f4f58f2408aa - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: c94d79bb131771c5f8823c8bce21f4f58f2408aa (tree)
• Time: 2007-05-13 23:49:06
• Author: h677 <h677>
• Commiter: h677

Log Message

レスポップアップのメソッドを新設
ポップアップ中でメル欄のポップアップが利かない不具合の修正

Change Summary

• modified: Giko.pas
• modified: HTMLCreate.pas
• modified: ResPopupBrowser.pas

Incremental Difference

--- a/Giko.pas
+++ b/Giko.pas
@@ -1908,6 +1908,7 @@ begin
     end;
 	StatusBar.Panels[1].Text := Text2;
 
+
 	if FPreviewBrowser <> nil then
 		ShowWindow(FPreviewBrowser.Handle, SW_HIDE);
 
@@ -1962,8 +1963,8 @@ begin
                     FResPopupBrowser.PopupType := gptThread;
 					HTMLCreater.SetResPopupText(FResPopupBrowser.CreateNewBrowser, GetActiveContent, wkIntSt, wkIntTo, False, False);
 				end else begin
-                    FResPopupBrowser.PopupType := gptRaw;
-                    FResPopupBrowser.Title := s;
+                    FResPopupBrowser.CreateNewBrowser.PopupType := gptRaw;
+                    FResPopupBrowser.CreateNewBrowser.Title := s;
 				end;
 			end;
 		end else begin
@@ -2023,7 +2024,7 @@ begin
                         FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
                         ShowWindow(FResPopupBrowser.Handle, SW_HIDE);
                     end;
-                    FResPopupBrowser.PopupType := gptThread;
+                    FResPopupBrowser.CreateNewBrowser.PopupType := gptThread;
 					HTMLCreater.SetResPopupText(FResPopupBrowser.CreateNewBrowser, threadItem, wkIntSt, wkIntTo, ATitle, PathRec.FFirst );
 				end;
 			end;
@@ -2032,10 +2033,17 @@ begin
             FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
             ShowWindow(FResPopupBrowser.Handle, SW_HIDE);
         end;
-        if FResPopupBrowser.PopupType = gptRaw then begin
-            if FResPopupBrowser.Title <> '' then
+        if FResPopupBrowser.CreateNewBrowser.PopupType = gptRaw then begin
+            if FResPopupBrowser.CreateNewBrowser.Title <> '' then begin
                 FResPopupBrowser.CreateNewBrowser.TitlePopup;
-		end;
+            end;
+		end else begin
+            if FResPopupBrowser.CreateNewBrowser.RawDocument <> '' then begin
+                FResPopupBrowser.CreateNewBrowser.Popup;
+            end else if FResPopupBrowser.CreateNewBrowser.Title <> '' then begin
+                FResPopupBrowser.CreateNewBrowser.TitlePopup;
+            end;
+        end;
 	end;
 end;
 

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -1281,7 +1281,8 @@ begin
 			ToNum := StNum + MAX_POPUP_RES;
 
         Hint.Title := '';
-        
+        Hint.RawDocument := '';
+
 		//ƒ^ƒCƒgƒ‹•\Ž¦
 		if Title then
 				if ThreadItem <> nil then
@@ -1317,11 +1318,7 @@ begin
 				end;
 			end;
             if (Html.Count > 0) then begin
-                Hint.Write('<DL>' + Html.Text + '</DL>');
-            end else begin
-                if (Title) and (Hint.Title <> '') then begin
-                    Hint.TitlePopup;
-                end;
+                Hint.RawDocument := '<DL>' + Html.Text + '</DL>';
             end;
 		end;
 	finally

--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -18,8 +18,9 @@ type
 	TResPopupBrowser = class(TWebBrowser)
 	private
         FChild :TResPopupBrowser;
-        FParent:TResPopupBrowser;
+        FParentBrowser :TResPopupBrowser;
         FTitle :String;
+        FRawDocument: String;
    		FPopupType: TGikoPopupType;
         function GetBodyStyle(OnlyTitle: Boolean = False): string;
         function GetWindowHeight : Integer;
@@ -31,15 +32,18 @@ type
 		constructor Create(AOwner: TComponent); override;
 		destructor Destroy; override;
         property Child: TResPopupBrowser read FChild;
-        property Parent:TResPopupBrowser read FParent write FParent;
+        property ParentBrowser:TResPopupBrowser read FParentBrowser write FParentBrowser;
         property Title: String read FTitle write FTitle;
+        property RawDocument: String read FRawDocument write FRawDocument;
         function CreateNewBrowser: TResPopupBrowser;
+        function CurrentBrowser: TResPopupBrowser;
         procedure Write(ADocument: String; OnlyTitle: Boolean = False);
         procedure Clear;
         procedure ChildClear;
         procedure NavigateBlank;
     	property PopupType: TGikoPopupType read FPopupType write FPopupType;
         procedure TitlePopup;
+        procedure Popup;
 	end;
 
 implementation
@@ -52,6 +56,7 @@ begin
     FChild := nil;
     Visible := False;
     Title := '';
+    RawDocument := '';
 end;
 
 destructor TResPopupBrowser.Destroy;
@@ -73,20 +78,20 @@ begin
                 Result := FChild;
             end;
         end else begin
-                FChild := TResPopupBrowser.Create(Self);
-                TOleControl(FChild).Parent := nil;
-                FChild.Parent := Self;
-                FChild.NavigateBlank;
-                FChild.OnEnter := GikoForm.BrowserEnter;
-                FChild.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
-                FChild.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
-                FChild.OnNewWindow2 := GikoForm.BrowserNewWindow2;
-                ShowWindow(FChild.Handle, SW_HIDE);
+            FChild := TResPopupBrowser.Create(Self);
+            TOleControl(FChild).Parent := nil;
+            FChild.ParentBrowser := Self;
+            FChild.NavigateBlank;
+            FChild.OnEnter := GikoForm.BrowserEnter;
+            FChild.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
+            FChild.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
+            FChild.OnNewWindow2 := GikoForm.BrowserNewWindow2;
+            ShowWindow(FChild.Handle, SW_HIDE);
             Result := FChild;
         end;
     end else begin
         TOleControl(Self).Parent := nil;
-        FParent := nil;
+        FParentBrowser := nil;
         Self.NavigateBlank;
         Self.OnEnter := GikoForm.BrowserEnter;
         Self.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
@@ -94,7 +99,12 @@ begin
         Self.OnNewWindow2 := GikoForm.BrowserNewWindow2;
         Result := Self;
     end;
-
+end;
+function TResPopupBrowser.CurrentBrowser: TResPopupBrowser;
+begin
+    Result := Self.CreateNewBrowser;
+    if (Result.Parent <> nil) then
+        Result := Result.ParentBrowser;
 end;
 procedure TResPopupBrowser.NavigateBlank;
 begin
@@ -110,6 +120,10 @@ procedure TResPopupBrowser.TitlePopup;
 begin
     Write('', True);
 end;
+procedure TResPopupBrowser.Popup;
+begin
+    Write(Self.RawDocument, false);
+end;
 procedure TResPopupBrowser.Write(ADocument: String; OnlyTitle: Boolean = False);
 var
     doc: Variant;
@@ -192,6 +206,7 @@ begin
     ChildClear;
     if (Self.Visible) then begin
         Self.Title := '';
+        Self.RawDocument := '';
         NavigateBlank;
         ShowWindow(Self.Handle, SW_HIDE);
         Self.Visible := False;