From: jpbruyere Date: Mon, 1 Aug 2016 10:45:27 +0000 (+0200) Subject: Improve update queuing X-Git-Tag: v0.4~21^2~6 X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=7d84ba29057264497818c4c315bec7547cc9afac;p=jp%2Fcrow.git Improve update queuing modifié : src/GraphicObjects/GenericStack.cs modifié : src/GraphicObjects/GraphicObject.cs modifié : src/GraphicObjects/Group.cs modifié : src/GraphicObjects/Label.cs modifié : src/GraphicObjects/ListBox.cs modifié : src/GraphicObjects/TabView.cs modifié : src/Interface.cs modifié : src/StyleReader.cs tests updates modifié : Tests/BasicTests.cs modifié : Tests/Interfaces/Divers/testWindow.goml modifié : Tests/Interfaces/Divers/welcome.crow modifié : Tests/Interfaces/Expandable/0.crow renommé : Tests/Interfaces/Nouveau dossier/test4.1.crow -> Tests/Interfaces/Unsorted/test4.1.crow renommé : Tests/Interfaces/Nouveau dossier/test4.crow -> Tests/Interfaces/Unsorted/test4.crow renommé : Tests/Interfaces/Nouveau dossier/test6.crow -> Tests/Interfaces/Unsorted/test6.crow renommé : Tests/Interfaces/Nouveau dossier/testColorList.crow -> Tests/Interfaces/Unsorted/testColorList.crow renommé : Tests/Interfaces/Nouveau dossier/testDirViewer.crow -> Tests/Interfaces/Unsorted/testDirViewer.crow renommé : Tests/Interfaces/Nouveau dossier/testFileDialog.goml -> Tests/Interfaces/Unsorted/testFileDialog.goml renommé : Tests/Interfaces/Nouveau dossier/testImage.crow -> Tests/Interfaces/Unsorted/testImage.crow renommé : Tests/Interfaces/Nouveau dossier/testLabel.crow -> Tests/Interfaces/Unsorted/testLabel.crow renommé : Tests/Interfaces/Nouveau dossier/testMsgBox.crow -> Tests/Interfaces/Unsorted/testMsgBox.crow renommé : Tests/Interfaces/Nouveau dossier/testOutOfClipUpdate.crow -> Tests/Interfaces/Unsorted/testOutOfClipUpdate.crow renommé : Tests/Interfaces/Nouveau dossier/testRadioButton2.crow -> Tests/Interfaces/Unsorted/testRadioButton2.crow renommé : Tests/Interfaces/Nouveau dossier/testTabView.crow -> Tests/Interfaces/Unsorted/testTabView.crow renommé : Tests/Interfaces/Nouveau dossier/testTreeView.crow -> Tests/Interfaces/Unsorted/testTreeView.crow renommé : Tests/Interfaces/Nouveau dossier/testTypeViewer.goml -> Tests/Interfaces/Unsorted/testTypeViewer.goml modifié : Tests/Tests.csproj --- diff --git a/Tests/BasicTests.cs b/Tests/BasicTests.cs index 1382d739..58258634 100644 --- a/Tests/BasicTests.cs +++ b/Tests/BasicTests.cs @@ -10,7 +10,7 @@ namespace Tests class BasicTests : OpenTKGameWindow { public BasicTests () - : base(800, 600,"test: press spacebar to toogle test files") + : base(800, 600,"test: press to toogle test files") { } @@ -76,40 +76,42 @@ namespace Tests { base.OnLoad (e); - KeyboardKeyDown += GOLIBTests_KeyboardKeyDown1; + this.KeyDown += KeyboardKeyDown1; testFiles = new string [] { @"Interfaces/Divers/welcome.crow" }; - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray (); + testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Unsorted", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray (); //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/basicTests", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Stack", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Splitter", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Stack", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Splitter", "*.crow")).ToArray (); testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Expandable", "*.crow")).ToArray (); testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Divers", "*.crow")).ToArray (); - this.Title = testFiles [idx] + ". Press key to switch example."; + this.Title = testFiles [idx] + ". Press to switch example."; CrowInterface.LoadInterface(testFiles[idx]).DataSource = this; } - void GOLIBTests_KeyboardKeyDown1 (object sender, OpenTK.Input.KeyboardKeyEventArgs e) + void KeyboardKeyDown1 (object sender, OpenTK.Input.KeyboardKeyEventArgs e) { if (e.Key == OpenTK.Input.Key.Escape) { Quit (null, null); return; - } else if (e.Key == OpenTK.Input.Key.L) { + } else if (e.Key == OpenTK.Input.Key.F1) { TestList.Add ("new string"); NotifyValueChanged ("TestList", TestList); return; - } else if (e.Key == OpenTK.Input.Key.W) { - GraphicObject w = CrowInterface.LoadInterface("Interfaces/testWindow.goml"); + } else if (e.Key == OpenTK.Input.Key.F2) { + GraphicObject w = CrowInterface.LoadInterface ("Interfaces/Divers/testWindow.goml"); w.DataSource = this; return; - } + } else if (e.Key != OpenTK.Input.Key.F3) + return; CrowInterface.ClearInterface (); idx++; if (idx == testFiles.Length) idx = 0; - this.Title = testFiles [idx] + ". Press key to cycle examples."; + this.Title = testFiles [idx] + ". Press to cycle examples."; GraphicObject obj = CrowInterface.LoadInterface(testFiles[idx]); obj.DataSource = this; } diff --git a/Tests/Interfaces/Divers/testWindow.goml b/Tests/Interfaces/Divers/testWindow.goml index 9e184dff..09db6193 100755 --- a/Tests/Interfaces/Divers/testWindow.goml +++ b/Tests/Interfaces/Divers/testWindow.goml @@ -16,7 +16,7 @@ - diff --git a/Tests/Interfaces/Divers/welcome.crow b/Tests/Interfaces/Divers/welcome.crow index 504413a1..8a98b380 100644 --- a/Tests/Interfaces/Divers/welcome.crow +++ b/Tests/Interfaces/Divers/welcome.crow @@ -1,5 +1,5 @@  - \ No newline at end of file diff --git a/Tests/Interfaces/Expandable/0.crow b/Tests/Interfaces/Expandable/0.crow index d243e67e..0c37d335 100755 --- a/Tests/Interfaces/Expandable/0.crow +++ b/Tests/Interfaces/Expandable/0.crow @@ -1,11 +1,11 @@  - - - - - - + + + + + + diff --git a/Tests/Interfaces/Nouveau dossier/test4.1.crow b/Tests/Interfaces/Nouveau dossier/test4.1.crow deleted file mode 100755 index 2ac55cd0..00000000 --- a/Tests/Interfaces/Nouveau dossier/test4.1.crow +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Tests/Interfaces/Nouveau dossier/test4.crow b/Tests/Interfaces/Nouveau dossier/test4.crow deleted file mode 100755 index 06476f31..00000000 --- a/Tests/Interfaces/Nouveau dossier/test4.crow +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Tests/Interfaces/Nouveau dossier/test6.crow b/Tests/Interfaces/Nouveau dossier/test6.crow deleted file mode 100755 index 532450da..00000000 --- a/Tests/Interfaces/Nouveau dossier/test6.crow +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/Tests/Interfaces/Unsorted/test4.crow b/Tests/Interfaces/Unsorted/test4.crow new file mode 100755 index 00000000..06476f31 --- /dev/null +++ b/Tests/Interfaces/Unsorted/test4.crow @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Tests/Interfaces/Unsorted/test6.crow b/Tests/Interfaces/Unsorted/test6.crow new file mode 100755 index 00000000..532450da --- /dev/null +++ b/Tests/Interfaces/Unsorted/test6.crow @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + +