diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-09-13 14:44:26 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-09-13 14:44:26 +0200 |
| commit | 2616e6ee7a1a34036cc002d28543d0d7a657fdb2 (patch) | |
| tree | e48dacb4209e95cb963de76cb6fe1ffca07e77c1 /src/Interface.cs | |
| parent | b7786bbd327699b0a8dd30d5ca86fc20f28f5617 (diff) | |
Merge improvements from CrowIDE
modifié : Templates/DirectoryView.template
modifié : Templates/Menu.template
modifié : Templates/MenuItem.template
modifié : Templates/Window.template
modifié : Tests/Interfaces/Divers/0.crow
modifié : src/CompilerServices/CompilerServices.cs
modifié : src/ExtensionsMethods.cs
modifié : src/GraphicObjects/DirectoryView.cs
modifié : src/GraphicObjects/GraphicObject.cs
modifié : src/GraphicObjects/Group.cs
modifié : src/GraphicObjects/TreeView.cs
modifié : src/GraphicObjects/Wrapper.cs
modifié : src/IMLReader.cs
modifié : src/Interface.cs
modifié : src/ItemTemplate.cs
modifié : src/LayoutingQueueItem.cs
modifié : src/Measure.cs
modifié : src/Point.cs
Diffstat (limited to 'src/Interface.cs')
| -rw-r--r-- | src/Interface.cs | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/src/Interface.cs b/src/Interface.cs index d01d2e8f..1659c0ea 100644 --- a/src/Interface.cs +++ b/src/Interface.cs @@ -320,7 +320,18 @@ namespace Crow } #endregion - + #if DEBUG_LAYOUTING + public List<LQIList> LQIsTries = new List<LQIList>(); + public LQIList curLQIsTries = new LQIList(); + public List<LQIList> LQIs = new List<LQIList>(); + public LQIList curLQIs = new LQIList(); +// public static LayoutingQueueItem[] MultipleRunsLQIs { +// get { return curUpdateLQIs.Where(l=>l.LayoutingTries>2 || l.DiscardCount > 0).ToArray(); } +// } + public LayoutingQueueItem currentLQI = null; + #else + public List<LQIList> LQIs = null;//still create the var for CrowIDE + #endif public void Update(){ if (mouseRepeatCount > 0) { int mc = mouseRepeatCount; @@ -346,6 +357,15 @@ namespace Crow processLayouting (); + #if DEBUG_LAYOUTING + if (curLQIsTries.Count > 0){ + LQIsTries.Add(curLQIsTries); + curLQIsTries = new LQIList(); + LQIs.Add(curLQIs); + curLQIs = new LQIList(); + } + #endif + clippingRegistration (); processDrawing (); @@ -366,7 +386,14 @@ namespace Crow LayoutingQueueItem lqi = null; while (LayoutingQueue.Count > 0) { lqi = LayoutingQueue.Dequeue (); + #if DEBUG_LAYOUTING + currentLQI = lqi; + curLQIsTries.Add(currentLQI); + #endif lqi.ProcessLayouting (); + #if DEBUG_LAYOUTING + currentLQI = null; + #endif } LayoutingQueue = DiscardQueue; } @@ -496,6 +523,12 @@ namespace Crow g.ClearBinding (); GraphicTree.RemoveAt (0); } + #if DEBUG_LAYOUTING + LQIsTries = new List<LQIList>(); + curLQIsTries = new LQIList(); + LQIs = new List<LQIList>(); + curLQIs = new LQIList(); + #endif } public GraphicObject FindByName (string nameToFind) { |