mirror of
https://git.do.srb2.org/STJr/ZoneBuilder.git
synced 2024-11-10 06:41:49 +00:00
More fixes for erroneously being able to select object multiple times when paint selecting
This commit is contained in:
parent
914fb7ea34
commit
4794b0effc
3 changed files with 36 additions and 21 deletions
|
@ -545,23 +545,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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1290,23 +1290,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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -901,23 +901,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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue