• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscaphegui翻訳comegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

ギコナビ


Commit MetaInfo

Revisionc94d79bb131771c5f8823c8bce21f4f58f2408aa (tree)
Time2007-05-13 23:49:06
Authorh677 <h677>
Commiterh677

Log Message

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

Change Summary

Incremental Difference

--- a/Giko.pas
+++ b/Giko.pas
@@ -1908,6 +1908,7 @@ begin
19081908 end;
19091909 StatusBar.Panels[1].Text := Text2;
19101910
1911+
19111912 if FPreviewBrowser <> nil then
19121913 ShowWindow(FPreviewBrowser.Handle, SW_HIDE);
19131914
@@ -1962,8 +1963,8 @@ begin
19621963 FResPopupBrowser.PopupType := gptThread;
19631964 HTMLCreater.SetResPopupText(FResPopupBrowser.CreateNewBrowser, GetActiveContent, wkIntSt, wkIntTo, False, False);
19641965 end else begin
1965- FResPopupBrowser.PopupType := gptRaw;
1966- FResPopupBrowser.Title := s;
1966+ FResPopupBrowser.CreateNewBrowser.PopupType := gptRaw;
1967+ FResPopupBrowser.CreateNewBrowser.Title := s;
19671968 end;
19681969 end;
19691970 end else begin
@@ -2023,7 +2024,7 @@ begin
20232024 FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
20242025 ShowWindow(FResPopupBrowser.Handle, SW_HIDE);
20252026 end;
2026- FResPopupBrowser.PopupType := gptThread;
2027+ FResPopupBrowser.CreateNewBrowser.PopupType := gptThread;
20272028 HTMLCreater.SetResPopupText(FResPopupBrowser.CreateNewBrowser, threadItem, wkIntSt, wkIntTo, ATitle, PathRec.FFirst );
20282029 end;
20292030 end;
@@ -2032,10 +2033,17 @@ begin
20322033 FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
20332034 ShowWindow(FResPopupBrowser.Handle, SW_HIDE);
20342035 end;
2035- if FResPopupBrowser.PopupType = gptRaw then begin
2036- if FResPopupBrowser.Title <> '' then
2036+ if FResPopupBrowser.CreateNewBrowser.PopupType = gptRaw then begin
2037+ if FResPopupBrowser.CreateNewBrowser.Title <> '' then begin
20372038 FResPopupBrowser.CreateNewBrowser.TitlePopup;
2038- end;
2039+ end;
2040+ end else begin
2041+ if FResPopupBrowser.CreateNewBrowser.RawDocument <> '' then begin
2042+ FResPopupBrowser.CreateNewBrowser.Popup;
2043+ end else if FResPopupBrowser.CreateNewBrowser.Title <> '' then begin
2044+ FResPopupBrowser.CreateNewBrowser.TitlePopup;
2045+ end;
2046+ end;
20392047 end;
20402048 end;
20412049
--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -1281,7 +1281,8 @@ begin
12811281 ToNum := StNum + MAX_POPUP_RES;
12821282
12831283 Hint.Title := '';
1284-
1284+ Hint.RawDocument := '';
1285+
12851286 //ƒ^ƒCƒgƒ‹•\Ž¦
12861287 if Title then
12871288 if ThreadItem <> nil then
@@ -1317,11 +1318,7 @@ begin
13171318 end;
13181319 end;
13191320 if (Html.Count > 0) then begin
1320- Hint.Write('<DL>' + Html.Text + '</DL>');
1321- end else begin
1322- if (Title) and (Hint.Title <> '') then begin
1323- Hint.TitlePopup;
1324- end;
1321+ Hint.RawDocument := '<DL>' + Html.Text + '</DL>';
13251322 end;
13261323 end;
13271324 finally
--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -18,8 +18,9 @@ type
1818 TResPopupBrowser = class(TWebBrowser)
1919 private
2020 FChild :TResPopupBrowser;
21- FParent:TResPopupBrowser;
21+ FParentBrowser :TResPopupBrowser;
2222 FTitle :String;
23+ FRawDocument: String;
2324 FPopupType: TGikoPopupType;
2425 function GetBodyStyle(OnlyTitle: Boolean = False): string;
2526 function GetWindowHeight : Integer;
@@ -31,15 +32,18 @@ type
3132 constructor Create(AOwner: TComponent); override;
3233 destructor Destroy; override;
3334 property Child: TResPopupBrowser read FChild;
34- property Parent:TResPopupBrowser read FParent write FParent;
35+ property ParentBrowser:TResPopupBrowser read FParentBrowser write FParentBrowser;
3536 property Title: String read FTitle write FTitle;
37+ property RawDocument: String read FRawDocument write FRawDocument;
3638 function CreateNewBrowser: TResPopupBrowser;
39+ function CurrentBrowser: TResPopupBrowser;
3740 procedure Write(ADocument: String; OnlyTitle: Boolean = False);
3841 procedure Clear;
3942 procedure ChildClear;
4043 procedure NavigateBlank;
4144 property PopupType: TGikoPopupType read FPopupType write FPopupType;
4245 procedure TitlePopup;
46+ procedure Popup;
4347 end;
4448
4549 implementation
@@ -52,6 +56,7 @@ begin
5256 FChild := nil;
5357 Visible := False;
5458 Title := '';
59+ RawDocument := '';
5560 end;
5661
5762 destructor TResPopupBrowser.Destroy;
@@ -73,20 +78,20 @@ begin
7378 Result := FChild;
7479 end;
7580 end else begin
76- FChild := TResPopupBrowser.Create(Self);
77- TOleControl(FChild).Parent := nil;
78- FChild.Parent := Self;
79- FChild.NavigateBlank;
80- FChild.OnEnter := GikoForm.BrowserEnter;
81- FChild.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
82- FChild.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
83- FChild.OnNewWindow2 := GikoForm.BrowserNewWindow2;
84- ShowWindow(FChild.Handle, SW_HIDE);
81+ FChild := TResPopupBrowser.Create(Self);
82+ TOleControl(FChild).Parent := nil;
83+ FChild.ParentBrowser := Self;
84+ FChild.NavigateBlank;
85+ FChild.OnEnter := GikoForm.BrowserEnter;
86+ FChild.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
87+ FChild.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
88+ FChild.OnNewWindow2 := GikoForm.BrowserNewWindow2;
89+ ShowWindow(FChild.Handle, SW_HIDE);
8590 Result := FChild;
8691 end;
8792 end else begin
8893 TOleControl(Self).Parent := nil;
89- FParent := nil;
94+ FParentBrowser := nil;
9095 Self.NavigateBlank;
9196 Self.OnEnter := GikoForm.BrowserEnter;
9297 Self.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
@@ -94,7 +99,12 @@ begin
9499 Self.OnNewWindow2 := GikoForm.BrowserNewWindow2;
95100 Result := Self;
96101 end;
97-
102+end;
103+function TResPopupBrowser.CurrentBrowser: TResPopupBrowser;
104+begin
105+ Result := Self.CreateNewBrowser;
106+ if (Result.Parent <> nil) then
107+ Result := Result.ParentBrowser;
98108 end;
99109 procedure TResPopupBrowser.NavigateBlank;
100110 begin
@@ -110,6 +120,10 @@ procedure TResPopupBrowser.TitlePopup;
110120 begin
111121 Write('', True);
112122 end;
123+procedure TResPopupBrowser.Popup;
124+begin
125+ Write(Self.RawDocument, false);
126+end;
113127 procedure TResPopupBrowser.Write(ADocument: String; OnlyTitle: Boolean = False);
114128 var
115129 doc: Variant;
@@ -192,6 +206,7 @@ begin
192206 ChildClear;
193207 if (Self.Visible) then begin
194208 Self.Title := '';
209+ Self.RawDocument := '';
195210 NavigateBlank;
196211 ShowWindow(Self.Handle, SW_HIDE);
197212 Self.Visible := False;