Commit: 648ad6f41bb59a8b230922ca5f06052ee4bf6cd2 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revisión: 648ad6f41bb59a8b230922ca5f06052ee4bf6cd2 (tree)
• Tiempo: 2007-05-15 07:02:43
• Autor: h677 <h677>
• Commiter: h677

Log Message

数字の右クリックでレスポップアップしないの不具合の修正
レスポップアップでタスクバーに追加されないように修正
レスポップアップが消えた後にアクティブなスレッドにフォーカスを移すように修正

Cambiar Resumen

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

Diferencia incremental

--- a/Giko.pas
+++ b/Giko.pas
@@ -1683,9 +1683,16 @@ begin
 			FEvent.Free;
 
         // TODO ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì”jŠü
+        try
+            if FPreviewBrowser <> nil then  begin
+                TOleControl(FPreviewBrowser).Parent := nil;
+                FPreviewBrowser.Free;
+            end;
 
+        except
+        end;
 		//Preview”jŠü
-		if TPreviewBrowser <> nil then begin
+		if FPreviewBrowser <> nil then begin
 			FPreviewBrowser.Free;
 			FPreviewBrowser := nil;
 		end;
@@ -4836,16 +4843,17 @@ begin
 		s := CustomStringReplace(Range.text, '@', ' ');//‘SŠp‹ó”’‚𔼊p‹ó”’‚É
 		s := ZenToHan(Trim(s));
 		if GikoSys.IsNumeric(s) then begin
-
+			Num := StrToInt64(s);
 			ThreadItem := GetActiveContent;
-			if ThreadItem <> nil then begin
-				Num := StrToInt64(s);
+			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;
-                FResPopupBrowser.PopupType := gptThread;
+                FResPopupBrowser.CreateNewBrowser.PopupType := gptThread;
 				HTMLCreater.SetResPopupText(FResPopupBrowser.CreateNewBrowser, ThreadItem, Num, Num, False, False);
+                FResPopupBrowser.Popup;
 				Result := False;
 			end else
 				Result := True;

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -12,7 +12,7 @@ uses
 	MSHTML_TLB,
 {$IFEND}
   ComCtrls, BrowserRecord, Graphics, Messages, Setting, Dialogs,
-  ActiveX, MoveHistoryItem, HistoryList;
+  ActiveX, GikoSystem, MoveHistoryItem, HistoryList;
 
 const
 	CAPTION_NAME: string = 'ƒMƒRƒiƒr';
@@ -49,6 +49,7 @@ const
 
 
 type
+
   TGikoDM = class(TDataModule)
 	GikoFormActionList: TActionList;
 	OnlyAHundredResAction: TAction;
@@ -487,7 +488,7 @@ implementation
 
 uses
 	Windows, Math, Clipbrd,
-	Giko, GikoSystem, GikoUtil, BoardGroup,
+	Giko, GikoUtil, BoardGroup,
 	FavoriteArrange, Favorite, MojuUtils,
 	Editor, ListSelect, Search, Option, Round,
 	KeySetting, Gesture, Kotehan, ToolBarSetting,

--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -62,16 +62,32 @@ begin
     Visible := False;
     Title := '';
     RawDocument := '';
+    FEvent := nil;
 end;
 
 destructor TResPopupBrowser.Destroy;
 begin
+    Self.OnEnter := nil;
+    Self.OnBeforeNavigate2 := nil;
+    Self.OnStatusTextChange := nil;
+    Self.OnNewWindow2 := nil;
+    if (FChild <> nil) then begin
+        FChild.Free;
+        FChild := nil;
+    end;
+    if (FEvent <> nil) then begin
+        FEvent.Free;
+        FEvent := nil;
+    end;
+    FThread := nil;
 	inherited Destroy;
 end;
 
 procedure TResPopupBrowser.CreateParams(var Params: TCreateParams);
 begin
-	inherited CreateParams(Params);
+	inherited;
+    Params.Style := Params.Style or WS_EX_TOOLWINDOW;
+
 end;
 function TResPopupBrowser.CreateNewBrowser: TResPopupBrowser;
 begin
@@ -84,13 +100,17 @@ begin
             end;
         end else begin
             FChild := TResPopupBrowser.Create(Self);
-            TOleControl(FChild).Parent := nil;
+            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;
@@ -102,6 +122,9 @@ begin
         Self.OnBeforeNavigate2 := GikoForm.BrowserBeforeNavigate2;
         Self.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
         Self.OnNewWindow2 := GikoForm.BrowserNewWindow2;
+        SetWindowPos(Self.Handle, HWND_BOTTOM,
+            0, 0, 0 , 0,
+            SWP_NOSIZE or SWP_NOMOVE or  SWP_NOACTIVATE or SWP_HIDEWINDOW);
         Result := Self;
     end;
 end;
@@ -131,46 +154,46 @@ begin
 end;
 procedure TResPopupBrowser.Write(ADocument: String; OnlyTitle: Boolean = False);
 var
+	p: TPoint;
     doc: Variant;
    	ARect: TRect;
     FDispHtmlDocument: DispHTMLDocument;
 begin
-    Self.OnStatusTextChange := nil;
     try
-        try
-            // ‚¢‚Á‚½‚ñk¬
-            SetWindowPos(Self.Handle, HWND_TOP,
-                0, 0, 50 , 50,
-                SWP_NOMOVE or SWP_NOACTIVATE or SWP_HIDEWINDOW);
+        // ƒ^ƒXƒNƒo[‚©‚çÁ‚·
+        SetWindowLongA(Self.Handle, GWL_EXSTYLE, WS_EX_TOOLWINDOW);
+        GetCursorpos(p);
+        // ‚¢‚Á‚½‚ñk¬
+        SetWindowPos(Self.Handle, HWND_BOTTOM,
+            p.X, p.Y, 50 , 50,
+            SWP_NOACTIVATE or SWP_HIDEWINDOW);
+        doc := Idispatch( olevariant(Self.ControlInterface).Document) as IHTMLDocument2;
+        doc.open;
+        doc.charset := 'Shift_JIS';
+        doc.Write('<html><head>'#13#10 +
+                '<meta http-equiv="Content-type" content="text/html; charset=Shift_JIS">'#13#10
+                + GetBodyStyle(OnlyTitle) + '</head><body>'
+                + GetTitle(OnlyTitle)
+                + ADocument + '<a name="bottom"></a></body></html>');
+        doc.Close;
 
-            doc := Idispatch( olevariant(Self.ControlInterface).Document) as IHTMLDocument2;
-            doc.open;
-            doc.charset := 'Shift_JIS';
-            doc.Write('<html><head>'#13#10 +
-                    '<meta http-equiv="Content-type" content="text/html; charset=Shift_JIS">'#13#10
-                    + GetBodyStyle(OnlyTitle) + '</head><body>'
-                    + GetTitle(OnlyTitle)
-                    + ADocument + '<a name="bottom"></a></body></html>');
-            doc.Close;
+        ARect := CalcRect(Screen.WorkAreaHeight, Screen.WorkAreaWidth,
+             not OnlyTitle);
 
-            ARect := CalcRect(Screen.WorkAreaHeight, Screen.WorkAreaWidth,
-                 not OnlyTitle);
-            SetWindowPos(Self.Handle, HWND_TOP,
-                ARect.Left, ARect.Top,
-                (ARect.Right - ARect.Left) ,
-                (ARect.Bottom - ARect.Top),
-                SWP_NOACTIVATE or SWP_HIDEWINDOW);
-            FDispHtmlDocument := Idispatch(OleVariant(Self.ControlInterface).Document) as DispHTMLDocument;
-            FEvent := THTMLDocumentEventSink.Create(Self, FDispHtmlDocument, HTMLDocumentEvents2);
-            FEvent.OnClick := ResPopupBrowserClick;
-            ShowWindow(Self.Handle, SW_SHOWNOACTIVATE);
-            Self.Visible := True;
-        except
-        end;
-    finally
-        Self.OnStatusTextChange := GikoForm.BrowserStatusTextChange;
-    end;
+        FDispHtmlDocument := Idispatch(OleVariant(Self.ControlInterface).Document) as DispHTMLDocument;
+        FEvent := THTMLDocumentEventSink.Create(Self, FDispHtmlDocument, HTMLDocumentEvents2);
+        FEvent.OnClick := ResPopupBrowserClick;
+
+        Self.Visible := True;
+        SetWindowPos(Self.Handle, HWND_TOP,
+            ARect.Left, ARect.Top,
+            (ARect.Right - ARect.Left) ,
+            (ARect.Bottom - ARect.Top),
+            SWP_NOACTIVATE or SWP_HIDEWINDOW);
 
+        ShowWindow(Self.Handle, SW_SHOWNOACTIVATE);
+    except
+    end;
 end;
 function TResPopupBrowser.GetTitle(OnlyTitle: Boolean): string;
 begin
@@ -210,13 +233,24 @@ 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;
         FEvent.Free;
+        FEvent := nil;
         NavigateBlank;
         ShowWindow(Self.Handle, SW_HIDE);
         Self.Visible := False;
@@ -306,7 +340,16 @@ 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;
     Result := True;
 end;
 function TResPopupBrowser.GetThread: TThreadItem;

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