diff --git a/Source/Core/Controls/ButtonsNumericTextbox.cs b/Source/Core/Controls/ButtonsNumericTextbox.cs index f199ae04..e7127145 100644 --- a/Source/Core/Controls/ButtonsNumericTextbox.cs +++ b/Source/Core/Controls/ButtonsNumericTextbox.cs @@ -39,7 +39,8 @@ namespace CodeImp.DoomBuilder.Controls private bool ignorebuttonchange = false; private StepsList steps = null; - private float stepsize = 1; + private int stepsize = 1; + private float stepsizeFloat = 1.0f; //mxd #endregion @@ -48,7 +49,8 @@ namespace CodeImp.DoomBuilder.Controls public bool AllowDecimal { get { return textbox.AllowDecimal; } set { textbox.AllowDecimal = value; } } public bool AllowNegative { get { return textbox.AllowNegative; } set { textbox.AllowNegative = value; } } public bool AllowRelative { get { return textbox.AllowRelative; } set { textbox.AllowRelative = value; } } - public float ButtonStep { get { return stepsize; } set { stepsize = value; } } + public int ButtonStep { get { return stepsize; } set { stepsize = value; } } + public float ButtonStepFloat { get { return stepsizeFloat; } set { stepsizeFloat = value; } } //mxd. This is used when AllowDecimal is true override public string Text { get { return textbox.Text; } set { textbox.Text = value; } } internal NumericTextbox Textbox { get { return textbox; } } public StepsList StepValues { get { return steps; } set { steps = value; } } @@ -115,7 +117,7 @@ namespace CodeImp.DoomBuilder.Controls } else if(textbox.AllowDecimal) { - float newvalue = textbox.GetResultFloat(0.0f) - (float)(buttons.Value * stepsize); + float newvalue = textbox.GetResultFloat(0.0f) - (float)(buttons.Value * stepsizeFloat); if((newvalue < 0.0f) && !textbox.AllowNegative) newvalue = 0.0f; textbox.Text = newvalue.ToString(); } @@ -148,10 +150,7 @@ namespace CodeImp.DoomBuilder.Controls } else { - if(e.Delta < 0) - buttons.Value += 1; - else if(e.Delta > 0) - buttons.Value -= 1; + buttons.Value += Math.Sign(e.Delta) * 1; } } diff --git a/Source/Core/GZBuilder/Controls/PairedFieldsControl.Designer.cs b/Source/Core/GZBuilder/Controls/PairedFieldsControl.Designer.cs index 2b96c11d..a0223397 100644 --- a/Source/Core/GZBuilder/Controls/PairedFieldsControl.Designer.cs +++ b/Source/Core/GZBuilder/Controls/PairedFieldsControl.Designer.cs @@ -58,7 +58,7 @@ this.value1.AllowNegative = true; this.value1.AllowRelative = true; this.value1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.value1.ButtonStep = 1F; + this.value1.ButtonStep = 1; this.value1.Location = new System.Drawing.Point(89, 1); this.value1.Name = "value1"; this.value1.Size = new System.Drawing.Size(62, 24); @@ -73,7 +73,7 @@ this.value2.AllowNegative = true; this.value2.AllowRelative = true; this.value2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.value2.ButtonStep = 1F; + this.value2.ButtonStep = 1; this.value2.Location = new System.Drawing.Point(157, 1); this.value2.Name = "value2"; this.value2.Size = new System.Drawing.Size(62, 24); diff --git a/Source/Core/GZBuilder/Controls/PairedFieldsControl.cs b/Source/Core/GZBuilder/Controls/PairedFieldsControl.cs index 4c3ca072..02986499 100644 --- a/Source/Core/GZBuilder/Controls/PairedFieldsControl.cs +++ b/Source/Core/GZBuilder/Controls/PairedFieldsControl.cs @@ -16,7 +16,8 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls public string Field1 { get { return field1; } set { field1 = value; } } public string Field2 { get { return field2; } set { field2 = value; } } public bool AllowDecimal { get { return value1.AllowDecimal; } set { value1.AllowDecimal = value; value2.AllowDecimal = value; } } - public float ButtonStep { get { return value1.ButtonStep; } set { value1.ButtonStep = value; value2.ButtonStep = value; } } + public int ButtonStep { get { return value1.ButtonStep; } set { value1.ButtonStep = value; value2.ButtonStep = value; } } + public float ButtonStepFloat { get { return value1.ButtonStepFloat; } set { value1.ButtonStepFloat = value; value2.ButtonStepFloat = value; } } public PairedFieldsControl() { InitializeComponent(); diff --git a/Source/Core/GZBuilder/Controls/PairedIntControl.Designer.cs b/Source/Core/GZBuilder/Controls/PairedIntControl.Designer.cs index 0d01035c..1305bcd5 100644 --- a/Source/Core/GZBuilder/Controls/PairedIntControl.Designer.cs +++ b/Source/Core/GZBuilder/Controls/PairedIntControl.Designer.cs @@ -46,7 +46,7 @@ this.value1.AllowNegative = true; this.value1.AllowRelative = true; this.value1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.value1.ButtonStep = 1F; + this.value1.ButtonStep = 1; this.value1.Location = new System.Drawing.Point(89, 1); this.value1.Name = "value1"; this.value1.Size = new System.Drawing.Size(62, 24); @@ -61,7 +61,7 @@ this.value2.AllowNegative = true; this.value2.AllowRelative = true; this.value2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.value2.ButtonStep = 1F; + this.value2.ButtonStep = 1; this.value2.Location = new System.Drawing.Point(157, 1); this.value2.Name = "value2"; this.value2.Size = new System.Drawing.Size(62, 24); diff --git a/Source/Core/Windows/LinedefEditForm.Designer.cs b/Source/Core/Windows/LinedefEditForm.Designer.cs index 321faab2..cc157896 100644 --- a/Source/Core/Windows/LinedefEditForm.Designer.cs +++ b/Source/Core/Windows/LinedefEditForm.Designer.cs @@ -650,7 +650,7 @@ namespace CodeImp.DoomBuilder.Windows this.alpha.AllowDecimal = true; this.alpha.AllowNegative = false; this.alpha.AllowRelative = false; - this.alpha.ButtonStep = 0.1F; + this.alpha.ButtonStepFloat = 0.1F; this.alpha.Location = new System.Drawing.Point(243, 25); this.alpha.Name = "alpha"; this.alpha.Size = new System.Drawing.Size(65, 24); @@ -662,7 +662,7 @@ namespace CodeImp.DoomBuilder.Windows this.lockNumber.AllowDecimal = false; this.lockNumber.AllowNegative = false; this.lockNumber.AllowRelative = false; - this.lockNumber.ButtonStep = 1F; + this.lockNumber.ButtonStep = 1; this.lockNumber.Location = new System.Drawing.Point(405, 25); this.lockNumber.Name = "lockNumber"; this.lockNumber.Size = new System.Drawing.Size(65, 24); @@ -797,7 +797,7 @@ namespace CodeImp.DoomBuilder.Windows this.lightFront.AllowDecimal = false; this.lightFront.AllowNegative = true; this.lightFront.AllowRelative = true; - this.lightFront.ButtonStep = 16F; + this.lightFront.ButtonStep = 16; this.lightFront.Location = new System.Drawing.Point(90, 96); this.lightFront.Name = "lightFront"; this.lightFront.Size = new System.Drawing.Size(62, 24); @@ -810,7 +810,7 @@ namespace CodeImp.DoomBuilder.Windows this.frontsector.AllowDecimal = false; this.frontsector.AllowNegative = false; this.frontsector.AllowRelative = false; - this.frontsector.ButtonStep = 1F; + this.frontsector.ButtonStep = 1; this.frontsector.Location = new System.Drawing.Point(90, 35); this.frontsector.Name = "frontsector"; this.frontsector.Size = new System.Drawing.Size(130, 24); @@ -886,7 +886,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcFrontScaleBottom // this.pfcFrontScaleBottom.AllowDecimal = true; - this.pfcFrontScaleBottom.ButtonStep = 1F; + this.pfcFrontScaleBottom.ButtonStepFloat = 1F; this.pfcFrontScaleBottom.DefaultValue = 1F; this.pfcFrontScaleBottom.Field1 = "scalex_bottom"; this.pfcFrontScaleBottom.Field2 = "scaley_bottom"; @@ -899,7 +899,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcFrontScaleMid // this.pfcFrontScaleMid.AllowDecimal = true; - this.pfcFrontScaleMid.ButtonStep = 1F; + this.pfcFrontScaleMid.ButtonStepFloat = 1F; this.pfcFrontScaleMid.DefaultValue = 1F; this.pfcFrontScaleMid.Field1 = "scalex_mid"; this.pfcFrontScaleMid.Field2 = "scaley_mid"; @@ -912,7 +912,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcFrontScaleTop // this.pfcFrontScaleTop.AllowDecimal = true; - this.pfcFrontScaleTop.ButtonStep = 1F; + this.pfcFrontScaleTop.ButtonStepFloat = 1F; this.pfcFrontScaleTop.DefaultValue = 1F; this.pfcFrontScaleTop.Field1 = "scalex_top"; this.pfcFrontScaleTop.Field2 = "scaley_top"; @@ -925,7 +925,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcFrontOffsetBottom // this.pfcFrontOffsetBottom.AllowDecimal = true; - this.pfcFrontOffsetBottom.ButtonStep = 16F; + this.pfcFrontOffsetBottom.ButtonStepFloat = 16F; this.pfcFrontOffsetBottom.DefaultValue = 0F; this.pfcFrontOffsetBottom.Field1 = "offsetx_bottom"; this.pfcFrontOffsetBottom.Field2 = "offsety_bottom"; @@ -938,7 +938,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcFrontOffsetMid // this.pfcFrontOffsetMid.AllowDecimal = true; - this.pfcFrontOffsetMid.ButtonStep = 16F; + this.pfcFrontOffsetMid.ButtonStepFloat = 16F; this.pfcFrontOffsetMid.DefaultValue = 0F; this.pfcFrontOffsetMid.Field1 = "offsetx_mid"; this.pfcFrontOffsetMid.Field2 = "offsety_mid"; @@ -951,7 +951,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcFrontOffsetTop // this.pfcFrontOffsetTop.AllowDecimal = true; - this.pfcFrontOffsetTop.ButtonStep = 16F; + this.pfcFrontOffsetTop.ButtonStepFloat = 16F; this.pfcFrontOffsetTop.DefaultValue = 0F; this.pfcFrontOffsetTop.Field1 = "offsetx_top"; this.pfcFrontOffsetTop.Field2 = "offsety_top"; @@ -1117,7 +1117,7 @@ namespace CodeImp.DoomBuilder.Windows this.lightBack.AllowDecimal = false; this.lightBack.AllowNegative = true; this.lightBack.AllowRelative = true; - this.lightBack.ButtonStep = 16F; + this.lightBack.ButtonStep = 16; this.lightBack.Location = new System.Drawing.Point(90, 96); this.lightBack.Name = "lightBack"; this.lightBack.Size = new System.Drawing.Size(62, 24); @@ -1130,7 +1130,7 @@ namespace CodeImp.DoomBuilder.Windows this.backsector.AllowDecimal = false; this.backsector.AllowNegative = false; this.backsector.AllowRelative = false; - this.backsector.ButtonStep = 1F; + this.backsector.ButtonStep = 1; this.backsector.Location = new System.Drawing.Point(90, 35); this.backsector.Name = "backsector"; this.backsector.Size = new System.Drawing.Size(130, 24); @@ -1206,7 +1206,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcBackScaleBottom // this.pfcBackScaleBottom.AllowDecimal = true; - this.pfcBackScaleBottom.ButtonStep = 1F; + this.pfcBackScaleBottom.ButtonStepFloat = 1F; this.pfcBackScaleBottom.DefaultValue = 1F; this.pfcBackScaleBottom.Field1 = "scalex_bottom"; this.pfcBackScaleBottom.Field2 = "scaley_bottom"; @@ -1219,7 +1219,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcBackScaleMid // this.pfcBackScaleMid.AllowDecimal = true; - this.pfcBackScaleMid.ButtonStep = 1F; + this.pfcBackScaleMid.ButtonStepFloat = 1F; this.pfcBackScaleMid.DefaultValue = 1F; this.pfcBackScaleMid.Field1 = "scalex_mid"; this.pfcBackScaleMid.Field2 = "scaley_mid"; @@ -1232,7 +1232,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcBackScaleTop // this.pfcBackScaleTop.AllowDecimal = true; - this.pfcBackScaleTop.ButtonStep = 1F; + this.pfcBackScaleTop.ButtonStepFloat = 1F; this.pfcBackScaleTop.DefaultValue = 1F; this.pfcBackScaleTop.Field1 = "scalex_top"; this.pfcBackScaleTop.Field2 = "scaley_top"; @@ -1245,7 +1245,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcBackOffsetBottom // this.pfcBackOffsetBottom.AllowDecimal = true; - this.pfcBackOffsetBottom.ButtonStep = 16F; + this.pfcBackOffsetBottom.ButtonStepFloat = 16F; this.pfcBackOffsetBottom.DefaultValue = 0F; this.pfcBackOffsetBottom.Field1 = "offsetx_bottom"; this.pfcBackOffsetBottom.Field2 = "offsety_bottom"; @@ -1258,7 +1258,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcBackOffsetMid // this.pfcBackOffsetMid.AllowDecimal = true; - this.pfcBackOffsetMid.ButtonStep = 16F; + this.pfcBackOffsetMid.ButtonStepFloat = 16F; this.pfcBackOffsetMid.DefaultValue = 0F; this.pfcBackOffsetMid.Field1 = "offsetx_mid"; this.pfcBackOffsetMid.Field2 = "offsety_mid"; @@ -1271,7 +1271,7 @@ namespace CodeImp.DoomBuilder.Windows // pfcBackOffsetTop // this.pfcBackOffsetTop.AllowDecimal = true; - this.pfcBackOffsetTop.ButtonStep = 16F; + this.pfcBackOffsetTop.ButtonStepFloat = 16F; this.pfcBackOffsetTop.DefaultValue = 0F; this.pfcBackOffsetTop.Field1 = "offsetx_top"; this.pfcBackOffsetTop.Field2 = "offsety_top"; @@ -1434,7 +1434,7 @@ namespace CodeImp.DoomBuilder.Windows // pairedFieldsControl1 // this.pairedFieldsControl1.AllowDecimal = true; - this.pairedFieldsControl1.ButtonStep = 1F; + this.pairedFieldsControl1.ButtonStepFloat = 1F; this.pairedFieldsControl1.DefaultValue = 1F; this.pairedFieldsControl1.Field1 = "scalex_bottom"; this.pairedFieldsControl1.Field2 = "scaley_bottom"; @@ -1447,7 +1447,7 @@ namespace CodeImp.DoomBuilder.Windows // pairedFieldsControl2 // this.pairedFieldsControl2.AllowDecimal = true; - this.pairedFieldsControl2.ButtonStep = 1F; + this.pairedFieldsControl2.ButtonStepFloat = 1F; this.pairedFieldsControl2.DefaultValue = 1F; this.pairedFieldsControl2.Field1 = "scalex_mid"; this.pairedFieldsControl2.Field2 = "scaley_mid"; @@ -1460,7 +1460,7 @@ namespace CodeImp.DoomBuilder.Windows // pairedFieldsControl3 // this.pairedFieldsControl3.AllowDecimal = true; - this.pairedFieldsControl3.ButtonStep = 1F; + this.pairedFieldsControl3.ButtonStepFloat = 1F; this.pairedFieldsControl3.DefaultValue = 1F; this.pairedFieldsControl3.Field1 = "scalex_top"; this.pairedFieldsControl3.Field2 = "scaley_top"; @@ -1473,7 +1473,7 @@ namespace CodeImp.DoomBuilder.Windows // pairedFieldsControl4 // this.pairedFieldsControl4.AllowDecimal = false; - this.pairedFieldsControl4.ButtonStep = 1F; + this.pairedFieldsControl4.ButtonStep = 1; this.pairedFieldsControl4.DefaultValue = 0F; this.pairedFieldsControl4.Field1 = "offsetx_bottom"; this.pairedFieldsControl4.Field2 = "offsety_bottom"; @@ -1486,7 +1486,7 @@ namespace CodeImp.DoomBuilder.Windows // pairedFieldsControl5 // this.pairedFieldsControl5.AllowDecimal = false; - this.pairedFieldsControl5.ButtonStep = 1F; + this.pairedFieldsControl5.ButtonStep = 1; this.pairedFieldsControl5.DefaultValue = 0F; this.pairedFieldsControl5.Field1 = "offsetx_mid"; this.pairedFieldsControl5.Field2 = "offsety_mid"; @@ -1499,7 +1499,7 @@ namespace CodeImp.DoomBuilder.Windows // pairedFieldsControl6 // this.pairedFieldsControl6.AllowDecimal = false; - this.pairedFieldsControl6.ButtonStep = 1F; + this.pairedFieldsControl6.ButtonStep = 1; this.pairedFieldsControl6.DefaultValue = 0F; this.pairedFieldsControl6.Field1 = "offsetx_top"; this.pairedFieldsControl6.Field2 = "offsety_top"; @@ -1544,7 +1544,7 @@ namespace CodeImp.DoomBuilder.Windows this.buttonsNumericTextbox1.AllowDecimal = false; this.buttonsNumericTextbox1.AllowNegative = true; this.buttonsNumericTextbox1.AllowRelative = true; - this.buttonsNumericTextbox1.ButtonStep = 1F; + this.buttonsNumericTextbox1.ButtonStep = 1; this.buttonsNumericTextbox1.Location = new System.Drawing.Point(57, 13); this.buttonsNumericTextbox1.Name = "buttonsNumericTextbox1"; this.buttonsNumericTextbox1.Size = new System.Drawing.Size(78, 24); diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index 43048fd9..f4f8d82a 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -1536,7 +1536,7 @@ namespace CodeImp.DoomBuilder.Windows this.scripttabwidth.AllowDecimal = false; this.scripttabwidth.AllowNegative = false; this.scripttabwidth.AllowRelative = false; - this.scripttabwidth.ButtonStep = 2F; + this.scripttabwidth.ButtonStep = 2; this.scripttabwidth.Location = new System.Drawing.Point(259, 155); this.scripttabwidth.Name = "scripttabwidth"; this.scripttabwidth.Size = new System.Drawing.Size(71, 24); diff --git a/Source/Core/Windows/SectorEditForm.Designer.cs b/Source/Core/Windows/SectorEditForm.Designer.cs index c314c612..ca2b2732 100644 --- a/Source/Core/Windows/SectorEditForm.Designer.cs +++ b/Source/Core/Windows/SectorEditForm.Designer.cs @@ -177,7 +177,7 @@ namespace CodeImp.DoomBuilder.Windows this.brightness.AllowDecimal = false; this.brightness.AllowNegative = false; this.brightness.AllowRelative = true; - this.brightness.ButtonStep = 8F; + this.brightness.ButtonStep = 8; this.brightness.Location = new System.Drawing.Point(99, 124); this.brightness.Name = "brightness"; this.brightness.Size = new System.Drawing.Size(73, 24); @@ -189,7 +189,7 @@ namespace CodeImp.DoomBuilder.Windows this.ceilingheight.AllowDecimal = false; this.ceilingheight.AllowNegative = true; this.ceilingheight.AllowRelative = true; - this.ceilingheight.ButtonStep = 8F; + this.ceilingheight.ButtonStep = 8; this.ceilingheight.Location = new System.Drawing.Point(99, 35); this.ceilingheight.Name = "ceilingheight"; this.ceilingheight.Size = new System.Drawing.Size(88, 24); @@ -264,7 +264,7 @@ namespace CodeImp.DoomBuilder.Windows this.floorheight.AllowDecimal = false; this.floorheight.AllowNegative = true; this.floorheight.AllowRelative = true; - this.floorheight.ButtonStep = 8F; + this.floorheight.ButtonStep = 8; this.floorheight.Location = new System.Drawing.Point(99, 65); this.floorheight.Name = "floorheight"; this.floorheight.Size = new System.Drawing.Size(88, 24); diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs index a119152c..c0733a31 100644 --- a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs +++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs @@ -179,7 +179,7 @@ this.brightness.AllowDecimal = false; this.brightness.AllowNegative = false; this.brightness.AllowRelative = true; - this.brightness.ButtonStep = 8F; + this.brightness.ButtonStep = 8; this.brightness.Location = new System.Drawing.Point(125, 84); this.brightness.Name = "brightness"; this.brightness.Size = new System.Drawing.Size(81, 24); @@ -191,7 +191,7 @@ this.desaturation.AllowDecimal = true; this.desaturation.AllowNegative = false; this.desaturation.AllowRelative = false; - this.desaturation.ButtonStep = 0.1F; + this.desaturation.ButtonStepFloat = 0.1F; this.desaturation.Location = new System.Drawing.Point(125, 142); this.desaturation.Name = "desaturation"; this.desaturation.Size = new System.Drawing.Size(81, 24); @@ -237,7 +237,7 @@ this.gravity.AllowDecimal = true; this.gravity.AllowNegative = true; this.gravity.AllowRelative = true; - this.gravity.ButtonStep = 0.1F; + this.gravity.ButtonStepFloat = 0.1F; this.gravity.Location = new System.Drawing.Point(125, 112); this.gravity.Name = "gravity"; this.gravity.Size = new System.Drawing.Size(81, 24); @@ -309,7 +309,7 @@ this.ceilingheight.AllowDecimal = false; this.ceilingheight.AllowNegative = true; this.ceilingheight.AllowRelative = true; - this.ceilingheight.ButtonStep = 8F; + this.ceilingheight.ButtonStep = 8; this.ceilingheight.Location = new System.Drawing.Point(89, 19); this.ceilingheight.Name = "ceilingheight"; this.ceilingheight.Size = new System.Drawing.Size(88, 24); @@ -358,7 +358,7 @@ this.floorheight.AllowDecimal = false; this.floorheight.AllowNegative = true; this.floorheight.AllowRelative = true; - this.floorheight.ButtonStep = 8F; + this.floorheight.ButtonStep = 8; this.floorheight.Location = new System.Drawing.Point(89, 49); this.floorheight.Name = "floorheight"; this.floorheight.Size = new System.Drawing.Size(88, 24); @@ -537,7 +537,7 @@ this.floorAlpha.AllowDecimal = true; this.floorAlpha.AllowNegative = false; this.floorAlpha.AllowRelative = false; - this.floorAlpha.ButtonStep = 0.1F; + this.floorAlpha.ButtonStepFloat = 0.1F; this.floorAlpha.Location = new System.Drawing.Point(118, 145); this.floorAlpha.Name = "floorAlpha"; this.floorAlpha.Size = new System.Drawing.Size(62, 24); @@ -560,7 +560,7 @@ this.floorRotation.AllowDecimal = false; this.floorRotation.AllowNegative = true; this.floorRotation.AllowRelative = true; - this.floorRotation.ButtonStep = 5F; + this.floorRotation.ButtonStep = 5; this.floorRotation.Location = new System.Drawing.Point(118, 115); this.floorRotation.Name = "floorRotation"; this.floorRotation.Size = new System.Drawing.Size(62, 24); @@ -595,7 +595,7 @@ this.floorBrightness.AllowDecimal = false; this.floorBrightness.AllowNegative = true; this.floorBrightness.AllowRelative = true; - this.floorBrightness.ButtonStep = 16F; + this.floorBrightness.ButtonStep = 16; this.floorBrightness.Location = new System.Drawing.Point(118, 85); this.floorBrightness.Name = "floorBrightness"; this.floorBrightness.Size = new System.Drawing.Size(62, 24); @@ -618,7 +618,7 @@ // floorScale // this.floorScale.AllowDecimal = true; - this.floorScale.ButtonStep = 0.1F; + this.floorScale.ButtonStepFloat = 0.1F; this.floorScale.DefaultValue = 1F; this.floorScale.Field1 = "xscalefloor"; this.floorScale.Field2 = "yscalefloor"; @@ -631,7 +631,7 @@ // floorOffsets // this.floorOffsets.AllowDecimal = true; - this.floorOffsets.ButtonStep = 16F; + this.floorOffsets.ButtonStepFloat = 16F; this.floorOffsets.DefaultValue = 0F; this.floorOffsets.Field1 = "xpanningfloor"; this.floorOffsets.Field2 = "ypanningfloor"; @@ -707,7 +707,7 @@ this.ceilAlpha.AllowDecimal = true; this.ceilAlpha.AllowNegative = false; this.ceilAlpha.AllowRelative = false; - this.ceilAlpha.ButtonStep = 0.1F; + this.ceilAlpha.ButtonStepFloat = 0.1F; this.ceilAlpha.Location = new System.Drawing.Point(118, 145); this.ceilAlpha.Name = "ceilAlpha"; this.ceilAlpha.Size = new System.Drawing.Size(62, 24); @@ -730,7 +730,7 @@ this.ceilRotation.AllowDecimal = false; this.ceilRotation.AllowNegative = true; this.ceilRotation.AllowRelative = true; - this.ceilRotation.ButtonStep = 5F; + this.ceilRotation.ButtonStep = 5; this.ceilRotation.Location = new System.Drawing.Point(118, 115); this.ceilRotation.Name = "ceilRotation"; this.ceilRotation.Size = new System.Drawing.Size(62, 24); @@ -765,7 +765,7 @@ this.ceilBrightness.AllowDecimal = false; this.ceilBrightness.AllowNegative = true; this.ceilBrightness.AllowRelative = true; - this.ceilBrightness.ButtonStep = 16F; + this.ceilBrightness.ButtonStep = 16; this.ceilBrightness.Location = new System.Drawing.Point(118, 85); this.ceilBrightness.Name = "ceilBrightness"; this.ceilBrightness.Size = new System.Drawing.Size(62, 24); @@ -788,7 +788,7 @@ // ceilScale // this.ceilScale.AllowDecimal = true; - this.ceilScale.ButtonStep = 0.1F; + this.ceilScale.ButtonStepFloat = 0.1F; this.ceilScale.DefaultValue = 1F; this.ceilScale.Field1 = "xscaleceiling"; this.ceilScale.Field2 = "yscaleceiling"; @@ -801,7 +801,7 @@ // ceilOffsets // this.ceilOffsets.AllowDecimal = true; - this.ceilOffsets.ButtonStep = 16F; + this.ceilOffsets.ButtonStepFloat = 16F; this.ceilOffsets.DefaultValue = 0F; this.ceilOffsets.Field1 = "xpanningceiling"; this.ceilOffsets.Field2 = "ypanningceiling"; diff --git a/Source/Core/Windows/ThingEditForm.Designer.cs b/Source/Core/Windows/ThingEditForm.Designer.cs index 25142b79..6d4b9c88 100644 --- a/Source/Core/Windows/ThingEditForm.Designer.cs +++ b/Source/Core/Windows/ThingEditForm.Designer.cs @@ -177,7 +177,7 @@ namespace CodeImp.DoomBuilder.Windows this.posX.AllowDecimal = false; this.posX.AllowNegative = true; this.posX.AllowRelative = true; - this.posX.ButtonStep = 8F; + this.posX.ButtonStep = 8; this.posX.Location = new System.Drawing.Point(68, 16); this.posX.Name = "posX"; this.posX.Size = new System.Drawing.Size(72, 24); @@ -189,7 +189,7 @@ namespace CodeImp.DoomBuilder.Windows this.posY.AllowDecimal = false; this.posY.AllowNegative = true; this.posY.AllowRelative = true; - this.posY.ButtonStep = 8F; + this.posY.ButtonStep = 8; this.posY.Location = new System.Drawing.Point(68, 41); this.posY.Name = "posY"; this.posY.Size = new System.Drawing.Size(72, 24); @@ -201,7 +201,7 @@ namespace CodeImp.DoomBuilder.Windows this.posZ.AllowDecimal = false; this.posZ.AllowNegative = true; this.posZ.AllowRelative = true; - this.posZ.ButtonStep = 8F; + this.posZ.ButtonStep = 8; this.posZ.Location = new System.Drawing.Point(68, 66); this.posZ.Name = "posZ"; this.posZ.Size = new System.Drawing.Size(72, 24); @@ -213,7 +213,7 @@ namespace CodeImp.DoomBuilder.Windows this.angle.AllowDecimal = false; this.angle.AllowNegative = true; this.angle.AllowRelative = true; - this.angle.ButtonStep = 1F; + this.angle.ButtonStep = 1; this.angle.Location = new System.Drawing.Point(186, 16); this.angle.Name = "angle"; this.angle.Size = new System.Drawing.Size(57, 24); diff --git a/Source/Core/Windows/VertexEditForm.Designer.cs b/Source/Core/Windows/VertexEditForm.Designer.cs index 8854b378..8491df43 100644 --- a/Source/Core/Windows/VertexEditForm.Designer.cs +++ b/Source/Core/Windows/VertexEditForm.Designer.cs @@ -105,7 +105,7 @@ namespace CodeImp.DoomBuilder.Windows this.zceiling.AllowDecimal = false; this.zceiling.AllowNegative = true; this.zceiling.AllowRelative = true; - this.zceiling.ButtonStep = 1F; + this.zceiling.ButtonStep = 1; this.zceiling.Location = new System.Drawing.Point(188, 0); this.zceiling.Name = "zceiling"; this.zceiling.Size = new System.Drawing.Size(120, 24); @@ -118,7 +118,7 @@ namespace CodeImp.DoomBuilder.Windows this.zfloor.AllowDecimal = false; this.zfloor.AllowNegative = true; this.zfloor.AllowRelative = true; - this.zfloor.ButtonStep = 1F; + this.zfloor.ButtonStep = 1; this.zfloor.Location = new System.Drawing.Point(188, 32); this.zfloor.Name = "zfloor"; this.zfloor.Size = new System.Drawing.Size(120, 24); @@ -149,7 +149,7 @@ namespace CodeImp.DoomBuilder.Windows this.positiony.AllowDecimal = false; this.positiony.AllowNegative = true; this.positiony.AllowRelative = true; - this.positiony.ButtonStep = 1F; + this.positiony.ButtonStep = 1; this.positiony.Location = new System.Drawing.Point(236, 34); this.positiony.Name = "positiony"; this.positiony.Size = new System.Drawing.Size(120, 24); @@ -162,7 +162,7 @@ namespace CodeImp.DoomBuilder.Windows this.positionx.AllowDecimal = false; this.positionx.AllowNegative = true; this.positionx.AllowRelative = true; - this.positionx.ButtonStep = 1F; + this.positionx.ButtonStep = 1; this.positionx.Location = new System.Drawing.Point(68, 34); this.positionx.Name = "positionx"; this.positionx.Size = new System.Drawing.Size(120, 24);