Commit: 0b1a69bc85e758a26f33974cc2e1af770aa85076 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 0b1a69bc85e758a26f33974cc2e1af770aa85076 (tree)
• Time: 2007-05-09 07:25:45
• Author: h677 <h677>
• Commiter: h677

Log Message

NewBrowserイベントが発生しない不具合対応

Change Summary

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

Incremental Difference

--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -70,6 +70,7 @@ begin
             TOleControl(FChild).Parent := nil;
             FChild.NavigateBlank;
             FChild.OnEnter := GikoForm.BrowserEnter;
+            FChild.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
             FChild.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
             FChild.OnNewWindow2 := GikoForm.BrowserNewWindow2;
             ShowWindow(FChild.Handle, SW_HIDE);
@@ -79,6 +80,7 @@ begin
         TOleControl(Self).Parent := nil;
         Self.NavigateBlank;
         Self.OnEnter := GikoForm.BrowserEnter;
+        Self.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
         Self.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
         Self.OnNewWindow2 := GikoForm.BrowserNewWindow2;
         Result := Self;
@@ -100,8 +102,6 @@ var
     doc: Variant;
    	ARect: TRect;
 begin
-    Self.Visible := True;
-    ShowWindow(Self.Handle, SW_SHOW);
     try
         doc := Idispatch( olevariant(Self.ControlInterface).Document) as IHTMLDocument2;
         doc.open;
@@ -119,12 +119,12 @@ begin
         end;
 
         ARect := CalcRect(Screen.Width);
-        SetWindowPos(Self.Handle, HWND_TOPMOST,
+        SetWindowPos(Self.Handle, HWND_TOP,
             ARect.Left, ARect.Top,
             (ARect.Right - ARect.Left) ,
             (ARect.Bottom - ARect.Top),
             SWP_NOACTIVATE or SWP_HIDEWINDOW);
-
+        Self.Visible := True;
         ShowWindow(Self.Handle, SW_SHOWNOACTIVATE);
 
     except
@@ -176,7 +176,6 @@ end;
 function TResPopupBrowser.CalcRect(MaxWidth: Integer): TRect;
 var
 	p: TPoint;
-    doc: Variant;
     ele: IHTMLElement2;
 begin
 	GetCursorpos(p);
@@ -185,15 +184,15 @@ begin
         ele.scrollWidth + 15,
         ele.scrollHeight + 15);
     case GikoSys.Setting.PopupPosition of
-        gppRightTop: 		OffsetRect(Result, p.x - (Result.Right - Result.Left), p.y - (Result.Bottom - Result.Top));
-        gppRight: 			OffsetRect(Result, p.x - (Result.Right - Result.Left), p.y - ((Result.Bottom - Result.Top) div 2));
-        gppRightBottom: OffsetRect(Result, p.x - (Result.Right - Result.Left), p.y);
-        gppTop:					OffsetRect(Result, p.x - ((Result.Right - Result.Left) div 2), p.y - (Result.Bottom - Result.Top));
+        gppRightTop: 		OffsetRect(Result, p.x - (Result.Right - Result.Left) - 2, p.y - (Result.Bottom - Result.Top) - 2);
+        gppRight: 			OffsetRect(Result, p.x - (Result.Right - Result.Left) - 2, p.y - ((Result.Bottom - Result.Top) div 2));
+        gppRightBottom: OffsetRect(Result, p.x - (Result.Right - Result.Left) -2, p.y + 2);
+        gppTop:					OffsetRect(Result, p.x - ((Result.Right - Result.Left) div 2), p.y - (Result.Bottom - Result.Top) - 2);
         gppCenter:			OffsetRect(Result, p.x - ((Result.Right - Result.Left) div 2), p.y - ((Result.Bottom - Result.Top) div 2));
-    	gppBottom:			OffsetRect(Result, p.x - ((Result.Right - Result.Left) div 2), p.y);
-        gppLeftTop:			OffsetRect(Result, p.x, p.y - (Result.Bottom - Result.Top));
-        gppLeft:				OffsetRect(Result, p.x, p.y - ((Result.Bottom - Result.Top) div 2));
-        gppLeftBottom: 	OffsetRect(Result, p.x, p.y);
+    	gppBottom:			OffsetRect(Result, p.x - ((Result.Right - Result.Left) div 2), p.y + 2);
+        gppLeftTop:			OffsetRect(Result, p.x + 2, p.y - (Result.Bottom - Result.Top) - 2);
+        gppLeft:				OffsetRect(Result, p.x + 2, p.y - ((Result.Bottom - Result.Top) div 2));
+        gppLeftBottom: 	OffsetRect(Result, p.x + 2, p.y + 2);
     end;
     if (Result.Left < 0) then begin
         OffsetRect(Result, -Result.Left, 0);

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