mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-01-31 04:40:55 +00:00
renamed events OnEndSelect to OnSelectEnd and OnEndEdit to OnEditEnd for naming consistency
This commit is contained in:
parent
8b6a6754ab
commit
0fd6efb82f
10 changed files with 35 additions and 35 deletions
|
@ -569,7 +569,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// End selection
|
// End selection
|
||||||
protected override void OnEndSelect()
|
protected override void OnSelectEnd()
|
||||||
{
|
{
|
||||||
// Not stopping from multiselection or modifying
|
// Not stopping from multiselection or modifying
|
||||||
if(!selecting && (mode == ModifyMode.None))
|
if(!selecting && (mode == ModifyMode.None))
|
||||||
|
@ -593,7 +593,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
base.OnEndSelect();
|
base.OnSelectEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is called wheh selection ends
|
// This is called wheh selection ends
|
||||||
|
@ -691,9 +691,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// Done editing
|
// Done editing
|
||||||
protected override void OnEndEdit()
|
protected override void OnEditEnd()
|
||||||
{
|
{
|
||||||
base.OnEndEdit();
|
base.OnEditEnd();
|
||||||
|
|
||||||
// Stop editing
|
// Stop editing
|
||||||
mode = ModifyMode.None;
|
mode = ModifyMode.None;
|
||||||
|
|
|
@ -364,12 +364,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// When edit button is released
|
// When edit button is released
|
||||||
protected override void OnEndEdit()
|
protected override void OnEditEnd()
|
||||||
{
|
{
|
||||||
// Just return to base mode, Disengage will be called automatically.
|
// Just return to base mode, Disengage will be called automatically.
|
||||||
General.Map.ChangeMode(General.Map.PreviousStableMode.Name);
|
General.Map.ChangeMode(General.Map.PreviousStableMode.Name);
|
||||||
|
|
||||||
base.OnEndEdit();
|
base.OnEditEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mouse moving
|
// Mouse moving
|
||||||
|
|
|
@ -349,12 +349,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// When edit button is released
|
// When edit button is released
|
||||||
protected override void OnEndEdit()
|
protected override void OnEditEnd()
|
||||||
{
|
{
|
||||||
// Just return to vertices mode, geometry will be merged on disengage.
|
// Just return to vertices mode, geometry will be merged on disengage.
|
||||||
General.Map.ChangeMode(basemode);
|
General.Map.ChangeMode(basemode);
|
||||||
|
|
||||||
base.OnEndEdit();
|
base.OnEditEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mouse moving
|
// Mouse moving
|
||||||
|
|
|
@ -946,10 +946,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// When edit button is released
|
// When edit button is released
|
||||||
protected override void OnEndEdit()
|
protected override void OnEditEnd()
|
||||||
{
|
{
|
||||||
base.OnEndEdit();
|
base.OnEditEnd();
|
||||||
OnEndSelect();
|
OnSelectEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// When select button is pressed
|
// When select button is pressed
|
||||||
|
@ -1088,9 +1088,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// When selected button is released
|
// When selected button is released
|
||||||
protected override void OnEndSelect()
|
protected override void OnSelectEnd()
|
||||||
{
|
{
|
||||||
base.OnEndSelect();
|
base.OnSelectEnd();
|
||||||
|
|
||||||
// Remove extension line
|
// Remove extension line
|
||||||
extensionline = new Line2D();
|
extensionline = new Line2D();
|
||||||
|
|
|
@ -283,7 +283,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// End selection
|
// End selection
|
||||||
protected override void OnEndSelect()
|
protected override void OnSelectEnd()
|
||||||
{
|
{
|
||||||
// Not stopping from multiselection?
|
// Not stopping from multiselection?
|
||||||
if(!selecting)
|
if(!selecting)
|
||||||
|
@ -304,7 +304,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
base.OnEndSelect();
|
base.OnSelectEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start editing
|
// Start editing
|
||||||
|
@ -348,7 +348,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// Done editing
|
// Done editing
|
||||||
protected override void OnEndEdit()
|
protected override void OnEditEnd()
|
||||||
{
|
{
|
||||||
// Edit pressed in this mode?
|
// Edit pressed in this mode?
|
||||||
if(editpressed)
|
if(editpressed)
|
||||||
|
@ -369,7 +369,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
editpressed = false;
|
editpressed = false;
|
||||||
base.OnEndEdit();
|
base.OnEditEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mouse moves
|
// Mouse moves
|
||||||
|
|
|
@ -277,7 +277,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// Done selecting
|
// Done selecting
|
||||||
protected override void OnEndSelect()
|
protected override void OnSelectEnd()
|
||||||
{
|
{
|
||||||
// Select was pressed in this mode?
|
// Select was pressed in this mode?
|
||||||
if(selectpressed && (editside == nearestside) && (nearestside != null))
|
if(selectpressed && (editside == nearestside) && (nearestside != null))
|
||||||
|
@ -309,7 +309,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
selectpressed = false;
|
selectpressed = false;
|
||||||
base.OnEndSelect();
|
base.OnSelectEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start editing
|
// Start editing
|
||||||
|
@ -322,7 +322,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// Done editing
|
// Done editing
|
||||||
protected override void OnEndEdit()
|
protected override void OnEditEnd()
|
||||||
{
|
{
|
||||||
// Edit was pressed in this mode?
|
// Edit was pressed in this mode?
|
||||||
if(editpressed && (editside == nearestside) && (nearestside != null))
|
if(editpressed && (editside == nearestside) && (nearestside != null))
|
||||||
|
@ -365,7 +365,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
editpressed = false;
|
editpressed = false;
|
||||||
base.OnEndEdit();
|
base.OnEditEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mouse moves
|
// Mouse moves
|
||||||
|
|
|
@ -371,7 +371,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// End selection
|
// End selection
|
||||||
protected override void OnEndSelect()
|
protected override void OnSelectEnd()
|
||||||
{
|
{
|
||||||
// Not stopping from multiselection?
|
// Not stopping from multiselection?
|
||||||
if(!selecting)
|
if(!selecting)
|
||||||
|
@ -390,7 +390,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
base.OnEndSelect();
|
base.OnSelectEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start editing
|
// Start editing
|
||||||
|
@ -433,7 +433,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// Done editing
|
// Done editing
|
||||||
protected override void OnEndEdit()
|
protected override void OnEditEnd()
|
||||||
{
|
{
|
||||||
// Edit pressed in this mode?
|
// Edit pressed in this mode?
|
||||||
if(editpressed)
|
if(editpressed)
|
||||||
|
@ -458,7 +458,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
editpressed = false;
|
editpressed = false;
|
||||||
base.OnEndEdit();
|
base.OnEditEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mouse moves
|
// Mouse moves
|
||||||
|
|
|
@ -273,7 +273,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// End selection
|
// End selection
|
||||||
protected override void OnEndSelect()
|
protected override void OnSelectEnd()
|
||||||
{
|
{
|
||||||
// Not ending from a multi-selection?
|
// Not ending from a multi-selection?
|
||||||
if(!selecting)
|
if(!selecting)
|
||||||
|
@ -292,7 +292,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
base.OnEndSelect();
|
base.OnSelectEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start editing
|
// Start editing
|
||||||
|
@ -327,7 +327,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// Done editing
|
// Done editing
|
||||||
protected override void OnEndEdit()
|
protected override void OnEditEnd()
|
||||||
{
|
{
|
||||||
// Edit pressed in this mode?
|
// Edit pressed in this mode?
|
||||||
if(editpressed)
|
if(editpressed)
|
||||||
|
@ -351,7 +351,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
editpressed = false;
|
editpressed = false;
|
||||||
base.OnEndEdit();
|
base.OnEditEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mouse moves
|
// Mouse moves
|
||||||
|
|
|
@ -211,7 +211,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// End selection
|
// End selection
|
||||||
protected override void OnEndSelect()
|
protected override void OnSelectEnd()
|
||||||
{
|
{
|
||||||
// Not stopping from multiselection?
|
// Not stopping from multiselection?
|
||||||
if(!selecting)
|
if(!selecting)
|
||||||
|
@ -229,7 +229,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
base.OnEndSelect();
|
base.OnSelectEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start editing
|
// Start editing
|
||||||
|
@ -281,10 +281,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
||||||
}
|
}
|
||||||
|
|
||||||
// Done editing
|
// Done editing
|
||||||
protected override void OnEndEdit()
|
protected override void OnEditEnd()
|
||||||
{
|
{
|
||||||
editpressed = false;
|
editpressed = false;
|
||||||
base.OnEndEdit();
|
base.OnEditEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mouse moves
|
// Mouse moves
|
||||||
|
|
|
@ -447,7 +447,7 @@ namespace CodeImp.DoomBuilder.Editing
|
||||||
/// (in Doom Builder 1, this was always the right mousebutton)
|
/// (in Doom Builder 1, this was always the right mousebutton)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[EndAction("classicedit", BaseAction = true)]
|
[EndAction("classicedit", BaseAction = true)]
|
||||||
protected virtual void OnEndEdit()
|
protected virtual void OnEditEnd()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -465,7 +465,7 @@ namespace CodeImp.DoomBuilder.Editing
|
||||||
/// (in Doom Builder 1, this was always the left mousebutton)
|
/// (in Doom Builder 1, this was always the left mousebutton)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[EndAction("classicselect", BaseAction = true)]
|
[EndAction("classicselect", BaseAction = true)]
|
||||||
protected virtual void OnEndSelect()
|
protected virtual void OnSelectEnd()
|
||||||
{
|
{
|
||||||
if(selecting) OnEndMultiSelection();
|
if(selecting) OnEndMultiSelection();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue