NGワードで特定の正規表現を使用するとフリーズする不具合を修正

[gikonavigoeson/gikonavi.git] / ToolBarSetting.pas

diff --git a/ToolBarSetting.pas b/ToolBarSetting.pas
index a45246a..c0e8b2a 100644 (file)
--- a/ToolBarSetting.pas
+++ b/ToolBarSetting.pas
@@ -111,7 +111,18 @@ end;
 
 //\83t\83H\81[\83\80\8dì\90¬
 procedure TToolBarSettingDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        FAllList := TList.Create;
 end;
 
@@ -144,7 +155,8 @@ begin
        ToolBarItem.ToolBar := ToolBar;
        ToolBarItem.ToolType := ToolType;
        for i := 0 to ToolBar.ControlCount - 1 do
-                if ToolBar.Controls[ i ] is TToolButton Then
+               if ToolBar.Controls[ i ] is TToolButton Then
+                       if not (ToolBar.Controls[ i ].Name = 'SelectComboBoxDummy') Then
                        ToolBarITem.ButtonActionList.Add(ToolBar.Controls[i].Action);
        ToolBarComboBox.Items.AddObject(ToolBar.Caption, ToolBarItem);
 end;
@@ -176,7 +188,7 @@ begin
                ToolBarItem := TToolBarItem(ToolBarComboBox.Items.Objects[i]);
 
                for j := ToolBarItem.ToolBar.ButtonCount - 1 downto 0 do
-                       ToolBarItem.ToolBar.RemoveControl(ToolBarItem.ToolBar.Buttons[j]);
+                       ToolBarItem.ToolBar.Buttons[j].HostDockSite := nil;
 
                for j := 0 to ToolBarItem.ButtonActionList.Count - 1 do begin
                        if ToolBarItem.ButtonActionList[j] = nil then begin