Commit: db2b41b32b051445bbb74dd1e870f1d8ba239936 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: db2b41b32b051445bbb74dd1e870f1d8ba239936 (tree)
• Zeit: 2007-05-16 01:38:20
• Autor: h677 <h677>
• Commiter: h677

Log Message

スレポップアップ中でクリックすると、レスポップアップしなくなる不具合対応

Ändern Zusammenfassung

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

Diff

--- a/Giko.pas
+++ b/Giko.pas
@@ -684,6 +684,8 @@ type
         procedure AddMenuSameBoardThread;
         //!  ƒAƒNƒeƒBƒu‚ȃ^ƒu‚Æ“¯‚¶”‚̊J‚¢‚Ä‚¢‚éƒXƒŒƒbƒhƒNƒŠƒbƒNƒCƒxƒ“ƒg
         procedure SameBoardThreadSubItemOnClick(Sender: TObject);
+        //! ƒ|ƒbƒvƒAƒbƒvƒuƒ‰ƒEƒUì¬
+        procedure CreateResPopupBrowser;
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 		procedure WndProc(var Message: TMessage); override;
@@ -1684,9 +1686,9 @@ begin
 
         // TODO ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì”jŠü
         try
-            if FPreviewBrowser <> nil then  begin
-                TOleControl(FPreviewBrowser).Parent := nil;
-                FPreviewBrowser.Free;
+            if FResPopupBrowser <> nil then  begin
+                TOleControl(FResPopupBrowser).Parent := nil;
+                FResPopupBrowser.Free;
             end;
 
         except
@@ -1920,9 +1922,11 @@ begin
 		ShowWindow(FPreviewBrowser.Handle, SW_HIDE);
 
     if FResPopupBrowser <> nil then begin
-        if not(Sender is TResPopupBrowser) then
-            FResPopupBrowser.Clear
-        else begin
+        if not(Sender is TResPopupBrowser) then begin
+            if (FResPopupBrowser.Visible) then begin
+                FResPopupBrowser.Clear;
+            end;
+        end else begin
             TResPopupBrowser(Sender).ChildClear;
         end;
     end;
@@ -1958,10 +1962,7 @@ begin
 			p.y := p.y - TWebBrowser(Sender).ClientOrigin.y;
 			e := IHTMLDocument2(TWebBrowser(Sender).Document).elementFromPoint(p.x, p.y);
 			if (Assigned(e)) then begin
-                if (FResPopupBrowser = nil) then begin
-                    FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
-                    ShowWindow(FResPopupBrowser.Handle, SW_HIDE);
-                end;
+                CreateResPopupBrowser;
 				tmp2 := ZenToHan(e.Get_outerText);
 				if (GikoSys.IsNumeric(tmp2)) then begin
 					//‚“‚̓ŒƒX”ԍ†‚Á‚Û‚¢‚Á‚·B
@@ -2027,19 +2028,13 @@ begin
 						wkIntSt := 1;
 						wkIntTo := 1;
 					end;
-                    if (FResPopupBrowser = nil) then begin
-                        FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
-                        ShowWindow(FResPopupBrowser.Handle, SW_HIDE);
-                    end;
+                    CreateResPopupBrowser;
                     FResPopupBrowser.CreateNewBrowser.PopupType := gptThread;
 					HTMLCreater.SetResPopupText(FResPopupBrowser.CreateNewBrowser, threadItem, wkIntSt, wkIntTo, ATitle, PathRec.FFirst );
 				end;
 			end;
 		end;
-        if (FResPopupBrowser = nil) then begin
-            FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
-            ShowWindow(FResPopupBrowser.Handle, SW_HIDE);
-        end;
+        CreateResPopupBrowser;
         if FResPopupBrowser.CreateNewBrowser.PopupType = gptRaw then begin
             if FResPopupBrowser.CreateNewBrowser.Title <> '' then begin
                 FResPopupBrowser.CreateNewBrowser.TitlePopup;
@@ -4652,7 +4647,9 @@ end;
 
 procedure TGikoForm.BrowserEnter(Sender: TObject);
 begin
-	Browser.DoObjectVerb(OLEIVERB_UIACTIVATE);
+    if (Sender is TWebBrowser) then begin
+    	TWebBrowser(Sender).DoObjectVerb(OLEIVERB_UIACTIVATE);
+    end;
 end;
 
 procedure TGikoForm.WMCopyData(var Message: TWMCopyData);
@@ -4847,10 +4844,7 @@ begin
 			ThreadItem := GetActiveContent;
 			if (ThreadItem <> nil) and (Num <= ThreadItem.Count)
                 and (Num > 0)then begin
-                if (FResPopupBrowser = nil) then begin
-                    FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
-                    ShowWindow(FResPopupBrowser.Handle, SW_HIDE);
-                end;
+                CreateResPopupBrowser;
                 FResPopupBrowser.CreateNewBrowser.PopupType := gptThread;
 				HTMLCreater.SetResPopupText(FResPopupBrowser.CreateNewBrowser, ThreadItem, Num, Num, False, False);
                 FResPopupBrowser.Popup;
@@ -7550,6 +7544,14 @@ begin
 
     end;
 end;
+//! ƒ|ƒbƒvƒAƒbƒvƒuƒ‰ƒEƒUì¬
+procedure TGikoForm.CreateResPopupBrowser;
+begin
+    if (FResPopupBrowser = nil) then begin
+        FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
+        //ShowWindow(FResPopupBrowser.Handle, SW_HIDE);
+    end;
+end;
 
 initialization
 				OleInitialize(nil);

--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -58,11 +58,13 @@ uses MojuUtils, GikoSystem, Setting, Giko, GikoDataModule;
 constructor TResPopupBrowser.Create(AOwner: TComponent);
 begin
 	inherited Create(AOwner);
-    FChild := nil;
+    TOleControl(Self).Parent := nil;
     Visible := False;
+    FChild := nil;
     Title := '';
     RawDocument := '';
     FEvent := nil;
+    ShowWindow(Self.Handle, SW_HIDE);
 end;
 
 destructor TResPopupBrowser.Destroy;
@@ -100,25 +102,19 @@ begin
             end;
         end else begin
             FChild := TResPopupBrowser.Create(Self);
-            TOleControl(FChild).Parent := TOleControl(Self).Parent;
             FChild.ParentBrowser := Self;
             FChild.NavigateBlank;
-
-            FChild.OnEnter := GikoForm.BrowserEnter;
             FChild.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
             FChild.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
             FChild.OnNewWindow2 := GikoForm.BrowserNewWindow2;
             SetWindowPos(FChild.Handle, HWND_BOTTOM,
                 0, 0, 0 , 0,
                 SWP_NOSIZE or SWP_NOMOVE or  SWP_NOACTIVATE or SWP_HIDEWINDOW);
-            ShowWindow(FChild.Handle, SW_HIDE);
             Result := FChild;
         end;
     end else begin
-        TOleControl(Self).Parent := nil;
         FParentBrowser := nil;
         Self.NavigateBlank;
-        Self.OnEnter := GikoForm.BrowserEnter;
         Self.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
         Self.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
         Self.OnNewWindow2 := GikoForm.BrowserNewWindow2;
@@ -158,8 +154,11 @@ var
     doc: Variant;
    	ARect: TRect;
     FDispHtmlDocument: DispHTMLDocument;
+    mainActive: Boolean;
 begin
     try
+        mainActive := GikoForm.Active;
+
         // ƒ^ƒXƒNƒo[‚©‚çÁ‚·
         SetWindowLongA(Self.Handle, GWL_EXSTYLE, WS_EX_TOOLWINDOW);
         GetCursorpos(p);
@@ -175,8 +174,10 @@ begin
                 + GetBodyStyle(OnlyTitle) + '</head><body>'
                 + GetTitle(OnlyTitle)
                 + ADocument + '<a name="bottom"></a></body></html>');
+
         doc.Close;
 
+
         ARect := CalcRect(Screen.WorkAreaHeight, Screen.WorkAreaWidth,
              not OnlyTitle);
 
@@ -185,13 +186,16 @@ begin
         FEvent.OnClick := ResPopupBrowserClick;
 
         Self.Visible := True;
-        SetWindowPos(Self.Handle, HWND_TOP,
+        SetWindowPos(Self.Handle, HWND_TOPMOST,
             ARect.Left, ARect.Top,
             (ARect.Right - ARect.Left) ,
             (ARect.Bottom - ARect.Top),
             SWP_NOACTIVATE or SWP_HIDEWINDOW);
 
         ShowWindow(Self.Handle, SW_SHOWNOACTIVATE);
+        if mainActive <> GikoForm.Active then begin
+            GikoForm.SetFocus;
+        end;
     except
     end;
 end;
@@ -233,19 +237,9 @@ begin
 end;
 
 procedure TResPopupBrowser.Clear;
-var
-    body: IHTMLElement2;
 begin
     ChildClear;
     if (Self.Visible) then begin
-        try
-            if (Self.ParentBrowser = nil) then begin
-                body := (Idispatch( olevariant(GikoForm.ActiveContent.Browser
-                    .ControlInterface).Document) as IHTMLDocument2).body as IHTMLElement2;
-                body.focus;
-            end;
-        except
-        end;
         Self.Title := '';
         Self.RawDocument := '';
         Self.FThread := nil;
@@ -340,16 +334,11 @@ begin
     end;
 end;
 function TResPopupBrowser.ResPopupBrowserClick(Sender: TObject): WordBool;
-var
-    doc: IHTMLDocument2;
-    body: IHTMLElement2;
 begin
-//    doc := Idispatch( olevariant(
-//        GikoForm.ActiveContent.Browser.ControlInterface).Document) as IHTMLDocument2;
-    doc := Idispatch( olevariant(
-        Self.ControlInterface).Document) as IHTMLDocument2;
-    body := (doc.body as IHTMLElement2);
-    body.focus;
+    if (not GikoSys.Setting.UnActivePopup) then begin
+        // ƒMƒRƒiƒr‚̃tƒH[ƒJƒX‚ð’D‚Á‚Ä‚é‚̂ŃtƒH[ƒ€‚É–³—‚â‚è•Ô‚·
+        GikoForm.SetFocus;
+    end;
     Result := True;
 end;
 function TResPopupBrowser.GetThread: TThreadItem;

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