起動時にカーソル位置が設定されない問題修正(ToDo ID=413) Thanks to 殊海夕音氏

[winbottle/winbottle.git] / bottleclient / MainForm.pas

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index a834d9d..9ddeead 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -21,6 +21,9 @@ uses
   SakuraScriptFountain, SppList, SurfacePreview, XDOM_2_3_J3, SsPlayTime,
   RegexUtils, StrReplace, StrReplaceDialog, ReplacePresetEditor;
 
+const
+  WM_SHOWED = WM_USER + 100;
+
 type
   TSurfacePreviewType = (spHint, spEditor);
 
@@ -359,6 +362,9 @@ type
     //
     procedure AppendTextLog(const FileName, Line: String);
     procedure AppendXMLLog(const FileName: String; Args: THeadValue);
+
+    procedure WMShowed(var Message: TMessage); message WM_SHOWED;
+
   protected
     procedure WndProc(var Message: TMessage); override;
     procedure WMQueryEndSession(var msg: TWMQueryEndSession);
@@ -617,8 +623,6 @@ begin
   // \83^\83X\83N\83o\81[\82Ì\8dÄ\8bN\93®(Explorer\82ª\97\8e\82¿\82½\82Æ\82«)\82ð\8c\9f\8fo\82·\82é
   FWM_TaskBarCreated := RegisterWindowMessage('TaskBarCreated');
 
-  // \83X\83N\83\8a\83v\83g\95¶\8e\9a\97ñ\82Ì\8f\89\8aú\89»
-  actClearExecute(Sender);
   // \83^\83X\83N\83g\83\8c\83C\82É\83A\83C\83R\83\93\82ð\92Ç\89Á
   ChangeTaskIcon;
   // \83`\83\83\83\93\83l\83\8b\8eQ\89Á\8aÖ\8cW\82Ì\83^\83u\82Ì\8f\88\97\9d\82È\82Ç(\83`\83\83\83\93\83l\83\8b\95s\8eQ\89Á\82Å\8f\89\8aú\89»)
@@ -946,20 +950,33 @@ end;
 procedure TfrmSender.FormShow(Sender: TObject);
 begin
   if FBooted or Application.Terminated then Exit;
+
   //LUID\82ª\8eæ\93¾\82³\82ê\82Ä\82¢\82ê\82Î\91\81\91¬\93o\98^\81B\82»\82¤\82Å\82È\82¯\82ê\82ÎLUID\8eæ\93¾\81B
   if Pref.LUID <> '' then BeginConnect
   else mnGetNewIdClick(Self);
+
   FAutoAddAfterGetChannel := Pref.AutoStart;
   FBooted := true;
+
   frmLog.Show;
   frmSurfacePreview.Show;
   Self.Show;
+
   SakuraSeeker.BeginDetect;
   SakuraSeekerDetectResultChanged(self);
   if (SakuraSeeker.Count = 0) and not Pref.NoWarnOfEmptyFMO then
     frmMessageBox.ShowMessage('\83S\81[\83X\83g(SSTP\83T\81[\83o)\82ª1\82Â\82à\8bN\93®\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B'#13#10 +
       'SSTP Bottle\82ð\97\98\97p\82·\82é\82½\82ß\82É\82Í\81A\83S\81[\83X\83g\82ð\93¯\8e\9e\82É\8bN\93®\82µ\82Ä\82­\82¾\82³\82¢\81B'#13#10 +
       '\8fÚ\8d×\82Í\83w\83\8b\83v\82ð\82²\97\97\89º\82³\82¢\81B');
+
+  //\83E\83C\83\93\83h\83E\82Ì\8f\89\8aú\89»\82ð\91Ò\82Â\95K\97v\82ª\82 \82é\8f\88\97\9d\82ÍWMShowed\82Ö\93\8a\82°\8d\9e\82Þ\82±\82Æ
+  PostMessage(Handle, WM_SHOWED, 0, 0);
+end;
+
+procedure TfrmSender.WMShowed(var Message: TMessage);
+begin
+  // \83X\83N\83\8a\83v\83g\95¶\8e\9a\97ñ\82Ì\8f\89\8aú\89»
+  ClearEditor;
 end;
 
 procedure TfrmSender.actAboutClick(Sender: TObject);