More fixes for erroneously being able to select object multiple times when paint selecting

This commit is contained in:
biwa 2021-02-13 22:59:06 +01:00
parent 18d56c6e04
commit 3fbad3c8ac
3 changed files with 36 additions and 21 deletions

View file

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

View file

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

View file

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