Skip to content

Commit 72e827e

Browse files
committed
WFA : Fixed PearlOffset input verifier error
1 parent 0ddaf15 commit 72e827e

File tree

1 file changed

+14
-30
lines changed

1 file changed

+14
-30
lines changed

PearlCalculatorWFA/PearlCalculatorForm.cs

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ public partial class PearlCalculatorWFA : Form
4141
};
4242

4343
private bool IsDisplayOnTNT = false;
44-
private string OffsetXTextBoxString = "0.";
45-
private string OffsetZTextBoxString = "0.";
4644
private int MaxTicks = 100;
4745
private int ManuallyAtntAmount = 0;
4846
private int ManuallyBtntAmount = 0;
@@ -328,43 +326,29 @@ private void TNTWeightTrackerSlider_Scroll(object sender , EventArgs e)
328326

329327
private void OffsetXTextBox_TextChanged(object sender , EventArgs e)
330328
{
331-
if(GeneralOffsetXTextBox.Text == OffsetXTextBoxString)
332-
{
333-
return;
334-
}
335329
Surface2D offset = new Surface2D();
336-
if(!double.TryParse(GeneralOffsetXTextBox.Text , out offset.X) || offset.X >= 1)
330+
double.TryParse(GeneralOffsetXTextBox.Text , out offset.X);
331+
GeneralData.PearlOffset = offset;
332+
if(offset.X != GeneralData.PearlOffset.X)
337333
{
338-
GeneralOffsetXTextBox.Text = OffsetXTextBoxString;
339-
GeneralOffsetXTextBox.Select(GeneralOffsetXTextBox.Text.Length , 0);
340-
}
341-
else
342-
{
343-
offset.Z = GeneralData.PearlOffset.Z;
344-
GeneralData.PearlOffset = offset;
345-
DisplaySetting();
346-
OffsetXTextBoxString = GeneralOffsetXTextBox.Text;
334+
if(GeneralData.PearlOffset.X == 0)
335+
GeneralOffsetXTextBox.Text = "0.";
336+
else
337+
GeneralOffsetXTextBox.Text = GeneralData.PearlOffset.X.ToString();
347338
}
348339
}
349340

350341
private void OffsetZTextBox_TextChanged(object sender , EventArgs e)
351342
{
352-
if(GeneralOffsetZTextBox.Text == OffsetZTextBoxString)
353-
{
354-
return;
355-
}
356343
Surface2D offset = new Surface2D();
357-
if(!double.TryParse(GeneralOffsetZTextBox.Text , out offset.Z) || offset.Z >= 1)
344+
double.TryParse(GeneralOffsetZTextBox.Text , out offset.Z);
345+
GeneralData.PearlOffset = offset;
346+
if(offset.Z != GeneralData.PearlOffset.Z)
358347
{
359-
GeneralOffsetZTextBox.Text = OffsetZTextBoxString;
360-
GeneralOffsetZTextBox.Select(GeneralOffsetZTextBox.Text.Length , 0);
361-
}
362-
else
363-
{
364-
offset.X = GeneralData.PearlOffset.X;
365-
GeneralData.PearlOffset = offset;
366-
DisplaySetting();
367-
OffsetZTextBoxString = GeneralOffsetZTextBox.Text;
348+
if(GeneralData.PearlOffset.Z == 0)
349+
GeneralOffsetZTextBox.Text = "0.";
350+
else
351+
GeneralOffsetZTextBox.Text = GeneralData.PearlOffset.Z.ToString();
368352
}
369353
}
370354

0 commit comments

Comments
 (0)