diff --git a/Base/Forms/GraphForm.cs b/Base/Forms/GraphForm.cs index b1b0588..b266525 100644 --- a/Base/Forms/GraphForm.cs +++ b/Base/Forms/GraphForm.cs @@ -504,6 +504,6 @@ public partial class GraphForm : Form { shifter.StartPosition = FormStartPosition.WindowsDefaultLocation; } - shifter.ShowDialog(); + shifter.Show(); } } diff --git a/Base/Forms/TranslateForm.Designer.cs b/Base/Forms/TranslateForm.Designer.cs index b6d756a..2f9f7c6 100644 --- a/Base/Forms/TranslateForm.Designer.cs +++ b/Base/Forms/TranslateForm.Designer.cs @@ -180,6 +180,7 @@ Name = "TranslateForm"; Padding = new System.Windows.Forms.Padding(15); Text = "Herm"; + TopMost = true; ((System.ComponentModel.ISupportInitialize)TrackX).EndInit(); ((System.ComponentModel.ISupportInitialize)TrackY).EndInit(); ResumeLayout(false); diff --git a/Base/Forms/TranslateForm.cs b/Base/Forms/TranslateForm.cs index cbb2567..fdd2240 100644 --- a/Base/Forms/TranslateForm.cs +++ b/Base/Forms/TranslateForm.cs @@ -9,8 +9,6 @@ public partial class TranslateForm : Form private readonly GraphForm refForm; // These variables both represent the same graphable. - private readonly Graphable ableRaw; - private readonly ITranslatable ableTrans; private readonly ITranslatableX? ableTransX; private readonly ITranslatableY? ableTransY; @@ -26,20 +24,20 @@ public partial class TranslateForm : Form Text = $"Translate {ableRaw.Name}"; TitleLabel.Text = $"Adjust Location for {ableRaw.Name}"; - MinBoxX.Leave += (o, e) => UpdateFromMinBoxY(); + MinBoxX.Leave += (o, e) => UpdateFromMinBoxX(); MinBoxX.KeyDown += (o, e) => { - if (e.KeyCode == Keys.Enter) UpdateFromMinBoxY(); + if (e.KeyCode == Keys.Enter) UpdateFromMinBoxX(); }; - MaxBoxX.Leave += (o, e) => UpdateFromMaxBoxY(); + MaxBoxX.Leave += (o, e) => UpdateFromMaxBoxX(); MaxBoxX.KeyDown += (o, e) => { - if (e.KeyCode == Keys.Enter) UpdateFromMaxBoxY(); + if (e.KeyCode == Keys.Enter) UpdateFromMaxBoxX(); }; - ThisValueX.Leave += (o, e) => UpdateFromThisBoxY(); + ThisValueX.Leave += (o, e) => UpdateFromThisBoxX(); ThisValueX.KeyDown += (o, e) => { - if (e.KeyCode == Keys.Enter) UpdateFromThisBoxY(); + if (e.KeyCode == Keys.Enter) UpdateFromThisBoxX(); }; MinBoxY.Leave += (o, e) => UpdateFromMinBoxY(); @@ -59,8 +57,6 @@ public partial class TranslateForm : Form }; refForm = graph; - this.ableRaw = ableRaw; - this.ableTrans = ableTrans; double curX = 0, curY = 0; if (ableTrans is ITranslatableX transX)