universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent BeginEdit/EndEdit during a BeginUpdate/EndUpdate wrapped task

Browse Source
This commit is contained in:
Michael Becker 2015-04-21 10:25:45 -04:00
parent da81c8e6fc
commit 43fd63e5a0
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editor.cs
View File

@ -211,11 +211,18 @@ namespace UniversalEditor.UserInterface.WindowsForms
set
{
ObjectModelChangingEventArgs omce = new ObjectModelChangingEventArgs(mvarObjectModel, value);
BeginUpdate();
OnObjectModelChanging(omce);
EndUpdate();
if (omce.Cancel) return;
mvarObjectModel = omce.NewObjectModel;
BeginUpdate();
OnObjectModelChanged(EventArgs.Empty);
EndUpdate();
}
}
#endregion
@ -266,9 +273,22 @@ namespace UniversalEditor.UserInterface.WindowsForms
}
private int mvarEditing = 0;
private int mvarUpdating = 0;
protected void BeginUpdate()
{
mvarUpdating++;
}
protected void EndUpdate()
{
if (mvarUpdating == 0) return;
mvarUpdating--;
}
protected void BeginEdit()
{
if (mvarUpdating > 0) return;
if (mvarEditing > 0)
{
mvarEditing++;
@ -326,6 +346,8 @@ namespace UniversalEditor.UserInterface.WindowsForms
}
protected void EndEdit()
{
if (mvarUpdating > 0) return;
if (mvarEditing == 0) return; // throw new InvalidOperationException();
if (mvarEditing > 1)
{