- Fixed immediate right-click-drag in Brightness mode

- Fixed potential crash and "ghost thing" left-over after cancelling pasted things
This commit is contained in:
codeimp 2009-05-09 17:38:59 +00:00
parent 574de14915
commit 1fc8947d29
6 changed files with 7 additions and 52 deletions

View file

@ -674,7 +674,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
{
// Make the highlight a selection if we have a highlight
if((highlighted != null) && !highlighted.IsDisposed)
{
SelectSector(highlighted, true, false);
orderedselection.Add(highlighted);
}
}
// Anything selected?

View file

@ -951,6 +951,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
modealreadyswitching = true;
this.OnAccept();
}
// Update
General.Map.ThingsFilter.Update();
General.Interface.RedrawDisplay();
// Hide highlight info
General.Interface.HideInfo();

View file

@ -519,19 +519,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
return base.OnCopyBegin();
}
// When pasting
public override bool OnPasteBegin()
{
// No selection made? But we have a highlight!
if((General.Map.Map.GetSelectedLinedefs(true).Count == 0) && (highlighted != null))
{
// Make the highlight the selection
highlighted.Selected = true;
}
return base.OnPasteBegin();
}
#endregion
#region ================== Actions

View file

@ -797,19 +797,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
return base.OnCopyBegin();
}
// When pasting
public override bool OnPasteBegin()
{
// No selection made? But we have a highlight!
if((General.Map.Map.GetSelectedSectors(true).Count == 0) && (highlighted != null))
{
// Make the highlight the selection
SelectSector(highlighted, true, true);
}
return base.OnPasteBegin();
}
// When undo is used
public override bool OnUndoBegin()
{

View file

@ -498,19 +498,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
return base.OnCopyBegin();
}
// When pasting
public override bool OnPasteBegin()
{
// No selection made? But we have a highlight!
if((General.Map.Map.GetSelectedThings(true).Count == 0) && (highlighted != null))
{
// Make the highlight the selection
highlighted.Selected = true;
}
return base.OnPasteBegin();
}
#endregion
#region ================== Actions

View file

@ -466,19 +466,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
return base.OnCopyBegin();
}
// When pasting
public override bool OnPasteBegin()
{
// No selection made? But we have a highlight!
if((General.Map.Map.GetSelectedVertices(true).Count == 0) && (highlighted != null))
{
// Make the highlight the selection
highlighted.Selected = true;
}
return base.OnPasteBegin();
}
#endregion
#region ================== Actions