diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-02-23 12:07:22 +0100 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-02-23 12:07:22 +0100 |
| commit | 938d7a404ec022a077579a8245e80d6fa5bbb890 (patch) | |
| tree | 24cce03708b03fdfddc75dcecc58d2986c992317 /src | |
| parent | c6ca894ad25ed736e58464dfb0b224145691f529 (diff) | |
crowIDE wip, lock layouting for items loading in tg
Diffstat (limited to 'src')
| -rw-r--r-- | src/CompilerServices/CompilerServices.cs | 24 | ||||
| -rw-r--r-- | src/GraphicObjects/TemplatedGroup.cs | 4 | ||||
| -rw-r--r-- | src/Interface.cs | 18 |
3 files changed, 24 insertions, 22 deletions
diff --git a/src/CompilerServices/CompilerServices.cs b/src/CompilerServices/CompilerServices.cs index dbd12d41..1e7fab8e 100644 --- a/src/CompilerServices/CompilerServices.cs +++ b/src/CompilerServices/CompilerServices.cs @@ -159,18 +159,18 @@ namespace Crow.IML else il.Emit (OpCodes.Ldc_I4_0); break; - // case TypeCode.Empty: - // break; - // case TypeCode.Object: - // break; - // case TypeCode.DBNull: - // break; - // case TypeCode.SByte: - // break; - // case TypeCode.Decimal: - // break; - // case TypeCode.DateTime: - // break; +// case TypeCode.Empty: +// break; +// case TypeCode.Object: +// break; +// case TypeCode.DBNull: +// break; +// case TypeCode.SByte: +// break; +// case TypeCode.Decimal: +// break; +// case TypeCode.DateTime: +// break; case TypeCode.Char: il.Emit (OpCodes.Ldc_I4, Convert.ToChar (val)); break; diff --git a/src/GraphicObjects/TemplatedGroup.cs b/src/GraphicObjects/TemplatedGroup.cs index 8025435d..a6f1b151 100644 --- a/src/GraphicObjects/TemplatedGroup.cs +++ b/src/GraphicObjects/TemplatedGroup.cs @@ -427,13 +427,13 @@ namespace Crow iTemp = ItemTemplates ["default"]; } - //lock (CurrentInterface.LayoutMutex) { + lock (CurrentInterface.LayoutMutex) { g = iTemp.CreateInstance(CurrentInterface); page.AddChild (g); // if (isPaged) g.LogicalParent = this; g.MouseDown += itemClick; - //} + } if (iTemp.Expand != null && g is Expandable) { (g as Expandable).Expand += iTemp.Expand; diff --git a/src/Interface.cs b/src/Interface.cs index 485101e6..3d2389b2 100644 --- a/src/Interface.cs +++ b/src/Interface.cs @@ -1091,16 +1091,18 @@ namespace Crow public void ShowContextMenu (GraphicObject go) { - if (ctxMenuContainer.Parent == null) - this.AddWidget (ctxMenuContainer); - else - ctxMenuContainer.IsOpened = true; + lock (UpdateMutex) { + if (ctxMenuContainer.Parent == null) + this.AddWidget (ctxMenuContainer); + else + ctxMenuContainer.IsOpened = true; - ctxMenuContainer.isPopup = true; - ctxMenuContainer.LogicalParent = go; - ctxMenuContainer.DataSource = go; + ctxMenuContainer.isPopup = true; + ctxMenuContainer.LogicalParent = go; + ctxMenuContainer.DataSource = go; - PutOnTop (ctxMenuContainer, true); + PutOnTop (ctxMenuContainer, true); + } ctxMenuContainer.Left = Mouse.X - 5; ctxMenuContainer.Top = Mouse.Y - 5; |