From: jpbruyere Date: Wed, 25 May 2016 06:11:05 +0000 (+0200) Subject: debug combobox X-Git-Tag: v0.4~61^2~4 X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=63cb46716cd042c2884687be2d47f7a5ce35e9c6;p=jp%2Fcrow.git debug combobox --- diff --git a/Crow.csproj b/Crow.csproj index 28e935da..4b108538 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -32,109 +32,293 @@ true DEBUG_FOCUS0;DEBUG_LAYOUTING0;TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0 false - $(SolutionDir)\build\obj\$(Configuration) - $(SolutionDir)\build\$(Configuration) + /mnt/data2/devel/Crow/build/e6fff453-f739-4ceb-bc28-57249f654fcd + /mnt/data2/devel/Crow/build/obj/e6fff453-f739-4ceb-bc28-57249f654fcd True + /mnt/data2/devel/Crow/build/e6fff453-f739-4ceb-bc28-57249f654fcd None __linux__;MEASURE_TIME - $(SolutionDir)\build\obj\$(Configuration) - $(SolutionDir)\build\$(Configuration) + /mnt/data2/devel/Crow/build/obj/e6fff453-f739-4ceb-bc28-57249f654fcd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -255,7 +439,11 @@ - - + + + + + + diff --git a/Crow.sln b/Crow.sln index 1fb7acdb..fd256cc4 100644 --- a/Crow.sln +++ b/Crow.sln @@ -47,7 +47,6 @@ Global {350D4F49-9901-4998-9903-BCA7D48DA58C}.Core-GLFW3|Any CPU.ActiveCfg = Debug|Linux_x86 {350D4F49-9901-4998-9903-BCA7D48DA58C}.Debug|Linux_x86.ActiveCfg = Debug|Linux_x86 {350D4F49-9901-4998-9903-BCA7D48DA58C}.Release|Linux_x86.ActiveCfg = Release|Linux_x86 - {350D4F49-9901-4998-9903-BCA7D48DA58C}.Release|Linux_x86.Build.0 = Release|Linux_x86 {66376B95-9351-4A63-B920-F4BB53FEF0E2}.Compatibility-GLFW2|Any CPU.ActiveCfg = Debug|Linux_x86 {66376B95-9351-4A63-B920-F4BB53FEF0E2}.Compatibility-GLFW2|Any CPU.Build.0 = Debug|Linux_x86 {66376B95-9351-4A63-B920-F4BB53FEF0E2}.Compatibility-GLFW3|Any CPU.ActiveCfg = Debug|Linux_x86 @@ -102,7 +101,6 @@ Global {D6F98B08-56B8-405C-9212-F9D26097E35F}.Core-GLFW3|Any CPU.ActiveCfg = Debug|Linux_x86 {D6F98B08-56B8-405C-9212-F9D26097E35F}.Debug|Linux_x86.ActiveCfg = Debug|Linux_x86 {D6F98B08-56B8-405C-9212-F9D26097E35F}.Release|Linux_x86.ActiveCfg = Release|Linux_x86 - {D6F98B08-56B8-405C-9212-F9D26097E35F}.Release|Linux_x86.Build.0 = Release|Linux_x86 {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Compatibility-GLFW2|Any CPU.ActiveCfg = Core-GLFW3|Any CPU {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Compatibility-GLFW2|Any CPU.Build.0 = Core-GLFW3|Any CPU {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Compatibility-GLFW3|Any CPU.ActiveCfg = Compatibility-GLFW3|Any CPU @@ -113,8 +111,8 @@ Global {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Core-GLFW3|Any CPU.Build.0 = Core-GLFW3|Any CPU {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Debug|Linux_x86.ActiveCfg = Core-GLFW3|Any CPU {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Debug|Linux_x86.Build.0 = Core-GLFW3|Any CPU - {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Release|Linux_x86.ActiveCfg = Compatibility-GLFW2|Any CPU - {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Release|Linux_x86.Build.0 = Compatibility-GLFW2|Any CPU + {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Release|Linux_x86.ActiveCfg = Core-GLFW3|Any CPU + {DDB6DB6D-E5DE-4BDB-8AC8-26DF800E9FF0}.Release|Linux_x86.Build.0 = Core-GLFW3|Any CPU {E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Compatibility-GLFW2|Any CPU.ActiveCfg = Debug|Any CPU {E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Compatibility-GLFW2|Any CPU.Build.0 = Debug|Any CPU {E9E14DB5-3C67-4E01-B5C3-4D90D7E31A2E}.Compatibility-GLFW3|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/OTKCrow/OTKCrow.csproj b/OTKCrow/OTKCrow.csproj index f4e1604a..65c9678e 100644 --- a/OTKCrow/OTKCrow.csproj +++ b/OTKCrow/OTKCrow.csproj @@ -11,12 +11,13 @@ 8.0.30703 2.0 0.4 + $(SolutionDir)/build/$(Configuration) + $(SolutionDir)/build/obj/$(Configuration) true full false - ..\bin\Debug DEBUG;MEASURE_TIME prompt 4 @@ -25,7 +26,6 @@ full true - ..\bin\Release prompt 4 false diff --git a/Templates/ComboBox.goml b/Templates/ComboBox.goml index d7b2cab5..aeedd97f 100755 --- a/Templates/ComboBox.goml +++ b/Templates/ComboBox.goml @@ -2,7 +2,8 @@ - - + - diff --git a/Templates/ItemTemplate.goml b/Templates/ItemTemplate.goml index d6784523..fc13ab4d 100755 --- a/Templates/ItemTemplate.goml +++ b/Templates/ItemTemplate.goml @@ -1,5 +1,6 @@  - ..\bin\Debug true full false @@ -26,7 +25,6 @@ false - ..\bin\Release none true 0 @@ -34,6 +32,12 @@ DEBUG;TRACE;MEASURE_TIME + /mnt/data2/devel/Crow/build/obj/Debug + /mnt/data2/devel/Crow/build/Debug + + + /mnt/data2/devel/Crow/build/Release + /mnt/data2/devel/Crow/build/obj/Release @@ -58,172 +62,232 @@ - - + + + + + + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + + + + - PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + Tests.Interfaces.test7.goml @@ -231,118 +295,157 @@ PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + PreserveNewest + - PreserveNewest + PreserveNewest + - - PreserveNewest + + + + + @@ -373,10 +476,6 @@ {C2980F9B-4798-4C05-99E2-E174810F7C7B} Crow - - {350D4F49-9901-4998-9903-BCA7D48DA58C} - OTKCrow - {66376B95-9351-4A63-B920-F4BB53FEF0E2} GLCrow diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 549f9a91..6175b2d8 100644 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -398,7 +398,8 @@ namespace Crow if (Parent is GenericStack) (Parent as GraphicObject).RegisterForLayouting (LayoutingType.ArrangeChildren); - RegisterForLayouting (LayoutingType.Sizing); + if (_isVisible) + RegisterForLayouting (LayoutingType.Sizing); RegisterForGraphicUpdate (); NotifyValueChanged ("Visible", _isVisible); @@ -803,10 +804,10 @@ namespace Crow //size constrain if (Slot.Width < MinimumSize.Width) { Slot.Width = MinimumSize.Width; - NotifyValueChanged ("WidthPolicy", Measure.Stretched); + //NotifyValueChanged ("WidthPolicy", Measure.Stretched); } else if (Slot.Width > MaximumSize.Width && MaximumSize.Width > 0) { Slot.Width = MaximumSize.Width; - NotifyValueChanged ("WidthPolicy", Measure.Stretched); + //NotifyValueChanged ("WidthPolicy", Measure.Stretched); } } else Slot.Width = 0; @@ -830,10 +831,10 @@ namespace Crow //size constrain if (Slot.Height < MinimumSize.Height) { Slot.Height = MinimumSize.Height; - NotifyValueChanged ("HeightPolicy", Measure.Stretched); + //NotifyValueChanged ("HeightPolicy", Measure.Stretched); } else if (Slot.Height > MaximumSize.Height && MaximumSize.Height > 0) { Slot.Height = MaximumSize.Height; - NotifyValueChanged ("HeightPolicy", Measure.Stretched); + //NotifyValueChanged ("HeightPolicy", Measure.Stretched); } } else Slot.Height = 0; diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/ListBox.cs index 54871241..8daf9550 100644 --- a/src/GraphicObjects/ListBox.cs +++ b/src/GraphicObjects/ListBox.cs @@ -207,6 +207,9 @@ namespace Crow } protected void _list_LayoutChanged (object sender, LayoutingEventArgs e) { +#if DEBUG_LAYOUTING + Debug.WriteLine("list_LayoutChanged"); +#endif if (_gsList.Orientation == Orientation.Horizontal) { if (e.LayoutType == LayoutingType.Width) _gsList.Width = approxSize; diff --git a/src/Input/KeyboardState.cs b/src/Input/KeyboardState.cs index 283b4a69..e3784bc3 100644 --- a/src/Input/KeyboardState.cs +++ b/src/Input/KeyboardState.cs @@ -236,7 +236,7 @@ namespace Crow internal void EnableBit(int offset) { - ValidateOffset(offset); + //ValidateOffset(offset); int int_offset = offset / 32; int bit_offset = offset % 32;