stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2024-11-12 23:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug where map elements could be selected multiple times when paint selecting in visual mode. Fixes #519. Fixes #520

Browse source
This commit is contained in:
biwa 2021-01-31 00:12:07 +01:00 committed by sphere
parent f8fbcbcd1f
commit 914fb7ea34
3 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
View file

@ -1009,23 +1009,28 @@ namespace CodeImp.DoomBuilder.BuilderModes
// toggle selected state // toggle selected state
if (General.Interface.ShiftState ^ BuilderPlug.Me.AdditivePaintSelect) if (General.Interface.ShiftState ^ BuilderPlug.Me.AdditivePaintSelect)
{ {
this.selected = true; if (!selected)
mode.AddSelectedObject(this); {
selected = true;
mode.AddSelectedObject(this);
}
} }
else if (General.Interface.CtrlState) else if (General.Interface.CtrlState)
{ {
this.selected = false; if (selected)
mode.RemoveSelectedObject(this); {
selected = false;
mode.RemoveSelectedObject(this);
}
} }
else else
{ {
if (this.selected) if (selected)
mode.RemoveSelectedObject(this); mode.RemoveSelectedObject(this);
else else
mode.AddSelectedObject(this); mode.AddSelectedObject(this);
this.selected = !this.selected; selected = !selected;
} }
} }

18
Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
View file

@ -1580,22 +1580,28 @@ namespace CodeImp.DoomBuilder.BuilderModes
// toggle selected state // toggle selected state
if (General.Interface.ShiftState ^ BuilderPlug.Me.AdditivePaintSelect) if (General.Interface.ShiftState ^ BuilderPlug.Me.AdditivePaintSelect)
{ {
this.selected = true; if (!selected)
mode.AddSelectedObject(this); {
selected = true;
mode.AddSelectedObject(this);
}
} }
else if (General.Interface.CtrlState) else if (General.Interface.CtrlState)
{ {
this.selected = false; if (selected)
mode.RemoveSelectedObject(this); {
selected = false;
mode.RemoveSelectedObject(this);
}
} }
else else
{ {
if (this.selected) if (selected)
mode.RemoveSelectedObject(this); mode.RemoveSelectedObject(this);
else else
mode.AddSelectedObject(this); mode.AddSelectedObject(this);
this.selected = !this.selected; selected = !selected;
} }
} }

18
Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs
View file

@ -931,22 +931,28 @@ namespace CodeImp.DoomBuilder.BuilderModes
// toggle selected state // toggle selected state
if (General.Interface.ShiftState ^ BuilderPlug.Me.AdditivePaintSelect) if (General.Interface.ShiftState ^ BuilderPlug.Me.AdditivePaintSelect)
{ {
this.selected = true; if (!selected)
mode.AddSelectedObject(this); {
selected = true;
mode.AddSelectedObject(this);
}
} }
else if (General.Interface.CtrlState) else if (General.Interface.CtrlState)
{ {
this.selected = false; if (selected)
mode.RemoveSelectedObject(this); {
selected = false;
mode.RemoveSelectedObject(this);
}
} }
else else
{ {
if (this.selected) if (selected)
mode.RemoveSelectedObject(this); mode.RemoveSelectedObject(this);
else else
mode.AddSelectedObject(this); mode.AddSelectedObject(this);
this.selected = !this.selected; selected = !selected;
} }
} }