]> O.S.I.I.S - jp/crow.git/commitdiff
remove Lock for LayoutingQueue: no used for now
authorjpbruyere <jp.bruyere@hotmail.com>
Thu, 4 Feb 2016 18:29:28 +0000 (19:29 +0100)
committerjpbruyere <jp.bruyere@hotmail.com>
Thu, 4 Feb 2016 18:29:28 +0000 (19:29 +0100)
UnitTest/NUnitCrowWindow.cs
src/GraphicObjects/GraphicObject.cs
src/OpenTKGameWindow.cs

index 086e122b552ceeeddd213b6f4b706242b03972ea..1ba9a32e661ccd4c4de1ad98bfc280a9e458be55 100644 (file)
@@ -149,7 +149,6 @@ namespace Crow
                        invGOList = invGOList.Reverse ().ToArray ();
 
                        //Debug.WriteLine ("======= Layouting queue start =======");
-                       lock (Interface.LayoutingQueue) {                               
                                while (Interface.LayoutingQueue.Count > 0) {
                                        //                                      Stopwatch lqiProcTime = new Stopwatch ();
                                        //                                      lqiProcTime.Start ();
@@ -162,7 +161,6 @@ namespace Crow
                                        //                                                      updateTime.ElapsedMilliseconds, lqi.ToString());
                                        //                                      }
                                }
-                       }
 
                        //final redraw clips should be added only when layout is completed among parents,
                        //that's why it take place in a second pass
index 6fe3a40459e2b8abe366b4f82026358ffafb8aa6..f6c9c84d0a555b5686f7ebc492b0257648eb7f84 100644 (file)
@@ -507,7 +507,7 @@ namespace Crow
                        #if DEBUG_LAYOUTING
                        Debug.WriteLine ("RegisterForLayouting => {1}->{0}", layoutType, this.ToString());
                        #endif
-                       lock (Interface.LayoutingQueue) {
+
                                deleteLQI (layoutType);
                                if ((layoutType & (int)LayoutingType.Width) > 0) {
                                        if (Bounds.Width == 0) //stretch in parent
@@ -535,7 +535,7 @@ namespace Crow
                                        //for x positionning, sizing of parent and this have to be done
                                        Interface.LayoutingQueue.EnqueueAfterThisAndParentSizing (LayoutingType.Y, this);
                        }
-               }
+
 
                /// <summary> trigger dependant sizing component update </summary>
                public virtual void OnLayoutChanges(LayoutingType  layoutType)
@@ -702,11 +702,9 @@ namespace Crow
                                LastSlots.Height = Slot.Height;
                                break;
                        }
-                       lock (Interface.LayoutingQueue) {
-                               //if no layouting remains in queue for item, registre for redraw
-                               if (this.RegisteredLQIs.Count () <= 0 && bmp == null)
-                                       this.RegisterForRedraw ();
-                       }
+                       //if no layouting remains in queue for item, registre for redraw
+                       if (this.RegisteredLQIs.Count () <= 0 && bmp == null)
+                               this.RegisterForRedraw ();
                }
 
                /// <summary> This is the common overridable drawing routine to create new widget </summary>
index b5317cefc33cbbb54973e464b90c329812ec629b..587dd9683fbd75cf16d647e14d2e958443dc847a 100644 (file)
@@ -261,7 +261,7 @@ namespace Crow
                        invGOList = invGOList.Reverse ().ToArray ();
 
                        //Debug.WriteLine ("======= Layouting queue start =======");
-                       lock (Interface.LayoutingQueue) {                               
+
                                while (Interface.LayoutingQueue.Count > 0) {
 //                                     Stopwatch lqiProcTime = new Stopwatch ();
 //                                     lqiProcTime.Start ();
@@ -274,7 +274,7 @@ namespace Crow
 //                                                     updateTime.ElapsedMilliseconds, lqi.ToString());
 //                                     }
                                }
-                       }
+
 
                        //Debug.WriteLine ("otd:" + gobjsToRedraw.Count.ToString () + "-");
                        //final redraw clips should be added only when layout is completed among parents,