diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-05-25 08:11:05 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-05-25 08:11:05 +0200 |
| commit | 63cb46716cd042c2884687be2d47f7a5ce35e9c6 (patch) | |
| tree | 2abb2f79ae281585e7dd524d598515ab9470f9f8 | |
| parent | b92a60c591756df6c2a93c212f425290b0a559ec (diff) | |
debug combobox
| -rw-r--r-- | Crow.csproj | 384 | ||||
| -rw-r--r-- | Crow.sln | 6 | ||||
| -rw-r--r-- | OTKCrow/OTKCrow.csproj | 4 | ||||
| -rwxr-xr-x | Templates/ComboBox.goml | 17 | ||||
| -rwxr-xr-x | Templates/ItemTemplate.goml | 1 | ||||
| -rw-r--r-- | Tests/GLCrow.cs | 40 | ||||
| -rwxr-xr-x | Tests/Interfaces/Container/1.crow | 4 | ||||
| -rwxr-xr-x | Tests/Interfaces/Container/2.crow | 4 | ||||
| -rwxr-xr-x | Tests/Interfaces/Divers/testCombobox.crow | 4 | ||||
| -rw-r--r-- | Tests/OpenTK.dll.config | 17 | ||||
| -rw-r--r-- | Tests/Tests.csproj | 127 | ||||
| -rw-r--r-- | src/GraphicObjects/GraphicObject.cs | 11 | ||||
| -rw-r--r-- | src/GraphicObjects/ListBox.cs | 3 | ||||
| -rw-r--r-- | src/Input/KeyboardState.cs | 2 |
14 files changed, 466 insertions, 158 deletions
diff --git a/Crow.csproj b/Crow.csproj index 28e935da..4b108538 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -32,109 +32,293 @@ <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> <DefineConstants>DEBUG_FOCUS0;DEBUG_LAYOUTING0;TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants> <Optimize>false</Optimize> - <IntermediateOutputPath>$(SolutionDir)\build\obj\$(Configuration)</IntermediateOutputPath> - <OutputPath>$(SolutionDir)\build\$(Configuration)</OutputPath> + <OutputPath>/mnt/data2/devel/Crow/build/e6fff453-f739-4ceb-bc28-57249f654fcd</OutputPath> + <IntermediateOutputPath>/mnt/data2/devel/Crow/build/obj/e6fff453-f739-4ceb-bc28-57249f654fcd</IntermediateOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <Optimize>True</Optimize> + <OutputPath>/mnt/data2/devel/Crow/build/e6fff453-f739-4ceb-bc28-57249f654fcd</OutputPath> <DebugType>None</DebugType> <DefineConstants>__linux__;MEASURE_TIME</DefineConstants> - <IntermediateOutputPath>$(SolutionDir)\build\obj\$(Configuration)</IntermediateOutputPath> - <OutputPath>$(SolutionDir)\build\$(Configuration)</OutputPath> + <IntermediateOutputPath>/mnt/data2/devel/Crow/build/obj/e6fff453-f739-4ceb-bc28-57249f654fcd</IntermediateOutputPath> </PropertyGroup> <ItemGroup> - <Compile Include="src\Colors.cs" /> - <Compile Include="src\Point.cs" /> - <Compile Include="src\Rectangle.cs" /> - <Compile Include="src\Rectangles.cs" /> - <Compile Include="src\Size.cs" /> - <Compile Include="src\GraphicObjects\GraphicObject.cs" /> - <Compile Include="src\GraphicObjects\Container.cs" /> - <Compile Include="src\GraphicObjects\Group.cs" /> - <Compile Include="src\GraphicObjects\HorizontalStack.cs" /> - <Compile Include="src\GraphicObjects\Image.cs" /> - <Compile Include="src\GraphicObjects\Label.cs" /> - <Compile Include="src\GraphicObjects\TextBox.cs" /> - <Compile Include="src\GraphicObjects\ProgressBar.cs" /> - <Compile Include="src\GraphicObjects\VerticalStack.cs" /> - <Compile Include="src\Cairo\CairoHelpers.cs" /> - <Compile Include="src\win32\Win32.cs" /> - <Compile Include="src\win32\winApi.cs" /> - <Compile Include="src\GraphicObjects\Button.cs" /> - <Compile Include="src\GraphicObjects\GraduatedSlider.cs" /> - <Compile Include="src\GraphicObjects\Slider.cs" /> - <Compile Include="src\GraphicObjects\NumericControl.cs" /> - <Compile Include="src\GraphicObjects\Scroller.cs" /> - <Compile Include="src\GraphicObjects\ILayoutable.cs" /> - <Compile Include="src\Enums.cs" /> - <Compile Include="src\GraphicObjects\GenericStack.cs" /> - <Compile Include="src\CompilerServices\CompilerServices.cs" /> - <Compile Include="src\GraphicObjects\AnalogMeter.cs" /> - <Compile Include="src\GraphicObjects\Border.cs" /> - <Compile Include="src\Font.cs" /> - <Compile Include="src\GraphicObjects\Window.cs" /> - <Compile Include="src\GraphicObjects\ListBox.cs" /> - <Compile Include="src\ExtensionsMethods.cs" /> - <Compile Include="src\Interface.cs" /> - <Compile Include="src\LayoutingQueueItem.cs" /> - <Compile Include="src\GraphicObjects\Spinner.cs" /> - <Compile Include="src\DynAttribute.cs" /> - <Compile Include="src\GraphicObjects\IValueChange.cs" /> - <Compile Include="src\Picture.cs" /> - <Compile Include="src\SvgPicture.cs" /> - <Compile Include="src\BmpPicture.cs" /> - <Compile Include="src\GraphicObjects\TemplatedControl.cs" /> - <Compile Include="src\GraphicObjects\RadioButton.cs" /> - <Compile Include="src\GraphicObjects\Expandable.cs" /> - <Compile Include="src\GraphicObjects\PrivateContainer.cs" /> - <Compile Include="src\GraphicObjects\TemplatedContainer.cs" /> - <Compile Include="src\GraphicObjects\Popper.cs" /> - <Compile Include="src\TextChangeEventArgs.cs" /> - <Compile Include="src\ReflexionExtensions.cs" /> - <Compile Include="src\XCursor.cs" /> - <Compile Include="src\GraphicObjects\Grid.cs" /> - <Compile Include="src\GraphicObjects\TextRun.cs" /> - <Compile Include="src\GraphicObjects\MessageBox.cs" /> - <Compile Include="src\SelectionChangeEventArgs.cs" /> - <Compile Include="src\ValueChangeEventArgs.cs" /> - <Compile Include="src\GraphicObjects\FileDialog.cs" /> - <Compile Include="src\GraphicObjects\CheckBox.cs" /> - <Compile Include="src\GraphicObjects\ComboBox.cs" /> - <Compile Include="src\GraphicObjects\GroupBox.cs" /> - <Compile Include="src\GraphicObjects\ScrollBar.cs" /> - <Compile Include="src\BubblingMouseButtonEventArgs.cs" /> - <Compile Include="src\SolidColor.cs" /> - <Compile Include="src\Gradient.cs" /> - <Compile Include="src\Fill\Fill.cs" /> - <Compile Include="src\LayoutingEventArgs.cs" /> - <Compile Include="src\ScrollingEventArgs.cs" /> - <Compile Include="src\GraphicObjects\Trend.cs" /> - <Compile Include="src\GraphicObjects\Splitter.cs" /> - <Compile Include="src\GraphicObjects\TreeView.cs" /> - <Compile Include="src\GraphicObjects\TabView.cs" /> - <Compile Include="src\GraphicObjects\TabItem.cs" /> - <Compile Include="src\GraphicObjects\DummyTemplate.cs" /> - <Compile Include="src\Input\KeyboardKeyEventArgs.cs" /> - <Compile Include="src\Input\Buttons.cs" /> - <Compile Include="src\Input\ButtonState.cs" /> - <Compile Include="src\Input\Key.cs" /> - <Compile Include="src\Input\KeyboardState.cs" /> - <Compile Include="src\Input\KeyModifiers.cs" /> - <Compile Include="src\Input\MouseButton.cs" /> - <Compile Include="src\Input\MouseEventArgs.cs" /> - <Compile Include="src\Input\MouseScroll.cs" /> - <Compile Include="src\Input\MouseState.cs" /> - <Compile Include="src\rsvg\DimensionData.cs" /> - <Compile Include="src\rsvg\Global.cs" /> - <Compile Include="src\rsvg\Handle.cs" /> - <Compile Include="src\rsvg\Pixbuf.cs" /> - <Compile Include="src\rsvg\RsvgSharp.SizeFuncNative.cs" /> - <Compile Include="src\rsvg\SizeFunc.cs" /> - <Compile Include="src\MouseCursorChangedEventArgs.cs" /> - <Compile Include="src\GraphicObjects\IBindable.cs" /> - <Compile Include="src\Input\KeyPressEventArgs.cs" /> - <Compile Include="src\Configuration.cs" /> - <Compile Include="src\Measure.cs" /> + <Compile Include="src\Colors.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Point.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Rectangle.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Rectangles.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Size.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\GraphicObject.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Container.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Group.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\HorizontalStack.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Image.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Label.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\TextBox.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\ProgressBar.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\VerticalStack.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Cairo\CairoHelpers.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\win32\Win32.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\win32\winApi.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Button.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\GraduatedSlider.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Slider.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\NumericControl.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Scroller.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\ILayoutable.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Enums.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\GenericStack.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\CompilerServices\CompilerServices.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\AnalogMeter.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Border.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Font.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Window.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\ListBox.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\ExtensionsMethods.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Interface.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\LayoutingQueueItem.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Spinner.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\DynAttribute.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\IValueChange.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Picture.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\SvgPicture.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\BmpPicture.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\TemplatedControl.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\RadioButton.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Expandable.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\PrivateContainer.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\TemplatedContainer.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Popper.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\TextChangeEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\ReflexionExtensions.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\XCursor.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Grid.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\TextRun.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\MessageBox.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\SelectionChangeEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\ValueChangeEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\FileDialog.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\CheckBox.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\ComboBox.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\GroupBox.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\ScrollBar.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\BubblingMouseButtonEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\SolidColor.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Gradient.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Fill\Fill.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\LayoutingEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\ScrollingEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Trend.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\Splitter.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\TreeView.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\TabView.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\TabItem.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\DummyTemplate.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\KeyboardKeyEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\Buttons.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\ButtonState.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\Key.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\KeyboardState.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\KeyModifiers.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\MouseButton.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\MouseEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\MouseScroll.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\MouseState.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\rsvg\DimensionData.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\rsvg\Global.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\rsvg\Handle.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\rsvg\Pixbuf.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\rsvg\RsvgSharp.SizeFuncNative.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\rsvg\SizeFunc.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\MouseCursorChangedEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\GraphicObjects\IBindable.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Input\KeyPressEventArgs.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Configuration.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="src\Measure.cs"> + <LogicalName></LogicalName> + </Compile> </ItemGroup> <ItemGroup> <Reference Include="System" /> @@ -255,7 +439,11 @@ <EmbeddedResource Include="Styles\TextRun.style" /> </ItemGroup> <ItemGroup> - <None Include="README.md" /> - <None Include="packages.config" /> + <None Include="README.md"> + <LogicalName></LogicalName> + </None> + <None Include="packages.config"> + <LogicalName></LogicalName> + </None> </ItemGroup> </Project> @@ -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 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ReleaseVersion>0.4</ReleaseVersion> + <OutputPath>$(SolutionDir)/build/$(Configuration)</OutputPath> + <IntermediateOutputPath>$(SolutionDir)/build/obj/$(Configuration)</IntermediateOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Linux_x86' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\bin\Debug</OutputPath> <DefineConstants>DEBUG;MEASURE_TIME</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -25,7 +26,6 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Linux_x86' "> <DebugType>full</DebugType> <Optimize>true</Optimize> - <OutputPath>..\bin\Release</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <ConsolePause>false</ConsolePause> 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 @@ <Popper Name="popper" PopDirection="Bottom" Height="{../HeightPolicy}" Width="{../WidthPolicy}"> <Template> <Border CornerRadius="0" Foreground="LightGray" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"> - <HorizontalStack Margin="1" Spacing="1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"> + <HorizontalStack Margin="0 + " Spacing="1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"> <TextBox MinimumSize="80;10" Margin="1" Foreground="Black" Background="White" Text="{../../../../SelectedItem}" Height="{../../../../HeightPolicy}" Width="{../../../../WidthPolicy}"/> @@ -13,15 +14,15 @@ </HorizontalStack> </Border> </Template> - <Border Background="DimGray" BorderWidth="1" Margin="1" - Fit="true"> - <Scroller Name="scroller1" Margin="2" VerticalScrolling="true" - MinimumSize="{../../../MinimumPopupSize}" MaximumSize="0;200" - Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}" + <Border Background="DimGray" BorderWidth="1" Margin="1" + MinimumSize="{../../MinimumPopupSize}" Fit="true"> + <Scroller Name="scroller1" Margin="2" VerticalScrolling="true" + MaximumSize="0;200" + Height="{../HeightPolicy}" Width="{../WidthPolicy}" HorizontalAlignment="Left" ValueChanged="../../../_scroller_ValueChanged"> - <VerticalStack LayoutChanged="../../../../_list_LayoutChanged" - Height="Fit" Width="{../WidthPolicy}" Name="List" Margin="0" + <VerticalStack LayoutChanged="../../../../_list_LayoutChanged" Background="Mantis" + Height="Fit" Width="{../../WidthPolicy}" Name="List" Margin="0" HorizontalAlignment="Left" VerticalAlignment="Top"/> </Scroller> 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 @@ <?xml version="1.0"?> <Container Fit="true" Margin="0" Focusable="true" + HorizontalAlignment="Left" MouseEnter="{Background=SteelBlue}" MouseLeave="{Background=Transparent}"> <Label Text="{}"/> diff --git a/Tests/GLCrow.cs b/Tests/GLCrow.cs index 35ee72b3..3064ad37 100644 --- a/Tests/GLCrow.cs +++ b/Tests/GLCrow.cs @@ -58,19 +58,19 @@ namespace Tests public IList<String> List2 = new List<string>(new string[] { "string1", - "string2", - "string3", - "string4", - "string5", - "string6", - "string7", - "string8", - "string8", - "string8", - "string8", - "string8", - "string8", - "string9" + "string2" + //"string3", + //"string4", + //"string5", + //"string6", + //"string7", + //"string8", + //"string8", + //"string8", + //"string8", + //"string8", + //"string8", + //"string9" } ); IList<Color> testList = Color.ColorDic.ToList(); @@ -97,15 +97,15 @@ namespace Tests public override void OnLoad () { - testFiles = new string [0]; - //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray (); + testFiles = new string [] { @"Interfaces/Divers/testCombobox.crow" }; + 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/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 (); + testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Expandable", "*.crow")).ToArray (); + testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Divers", "*.crow")).ToArray (); //testFiles = Directory.GetFiles(@"Interfaces", "*.crow").Concat(testFiles).ToArray(); this.Title = testFiles [idx]; diff --git a/Tests/Interfaces/Container/1.crow b/Tests/Interfaces/Container/1.crow index 274d9063..081c8715 100755 --- a/Tests/Interfaces/Container/1.crow +++ b/Tests/Interfaces/Container/1.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Container Background="Onyx" Margin="10" Width="90%" Height="90%"> - <GraphicObject Margin="10" Width="50%" Height="50%" Background="Mantis" +<Container Background="Lust" Margin="10" Width="90%" Height="90%"> + <GraphicObject Margin="10" Width="50%" Height="50%" Background="Maize" MinimumSize="50;50"/> </Container>
\ No newline at end of file diff --git a/Tests/Interfaces/Container/2.crow b/Tests/Interfaces/Container/2.crow index c619cb73..839a0fee 100755 --- a/Tests/Interfaces/Container/2.crow +++ b/Tests/Interfaces/Container/2.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Container Background="Onyx" Margin="10" Fit="true"> - <GraphicObject Margin="10" Width="50%" Height="50%" Background="Mantis" +<Container Background="Teal" Margin="10" Fit="true"> + <GraphicObject Margin="10" Width="50%" Height="50%" Background="Malachite" MinimumSize="50;50"/> </Container>
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/testCombobox.crow b/Tests/Interfaces/Divers/testCombobox.crow index 0c72cf0e..b52e9d82 100755 --- a/Tests/Interfaces/Divers/testCombobox.crow +++ b/Tests/Interfaces/Divers/testCombobox.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Container Background="Onyx"> - <ComboBox Width="200" Data="{TestList}" SelectedIndex="0" Background="Mantis" +<Container Background="Onyx" Width="300"> + <ComboBox Data="{TestList}" SelectedIndex="0" ItemTemplate="#Tests.Interfaces.colorItem.crow"/> </Container>
\ No newline at end of file diff --git a/Tests/OpenTK.dll.config b/Tests/OpenTK.dll.config new file mode 100644 index 00000000..23689f65 --- /dev/null +++ b/Tests/OpenTK.dll.config @@ -0,0 +1,17 @@ +<configuration> + <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/> + <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/> + <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/> + <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/> + <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/> + <dllmap os="linux" dll="libX11" target="libX11.so.6"/> + <dllmap os="linux" dll="libXi" target="libXi.so.6"/> + <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/> + <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/> + <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" /> + <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" /> + <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" /> + <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" /> + <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/> + <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/> +</configuration> diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index e4f9711d..0a839765 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -10,13 +10,12 @@ <AssemblyName>Tests</AssemblyName> <StartupObject>Tests.GLCrow</StartupObject> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <OutputPath>..\bin\$(configuration)</OutputPath> - <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath> + <OutputPath>$(SolutionDir)/build/$(Configuration)</OutputPath> + <IntermediateOutputPath>$(SolutionDir)/build/obj/$(Configuration)</IntermediateOutputPath> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ReleaseVersion>0.4</ReleaseVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> - <OutputPath>..\bin\Debug</OutputPath> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> @@ -26,7 +25,6 @@ <ConsolePause>false</ConsolePause> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> - <OutputPath>..\bin\Release</OutputPath> <DebugType>none</DebugType> <Optimize>true</Optimize> <WarningLevel>0</WarningLevel> @@ -34,6 +32,12 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DefineConstants>DEBUG;TRACE;MEASURE_TIME</DefineConstants> + <IntermediateOutputPath>/mnt/data2/devel/Crow/build/obj/Debug</IntermediateOutputPath> + <OutputPath>/mnt/data2/devel/Crow/build/Debug</OutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <OutputPath>/mnt/data2/devel/Crow/build/Release</OutputPath> + <IntermediateOutputPath>/mnt/data2/devel/Crow/build/obj/Release</IntermediateOutputPath> </PropertyGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> @@ -58,172 +62,232 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="Interfaces\testBorder.goml.cs" /> - <Compile Include="GLCrow.cs" /> + <Compile Include="Interfaces\testBorder.goml.cs"> + <LogicalName></LogicalName> + </Compile> + <Compile Include="GLCrow.cs"> + <LogicalName></LogicalName> + </Compile> </ItemGroup> <ItemGroup> <None Include="image\u.svg"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\log.xml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\testMeter.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\tmpMembers.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\itemTmp.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\tmpDirItem.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> + </None> + <None Include="GOLIBTests.cs"> + <LogicalName></LogicalName> </None> - <None Include="GOLIBTests.cs" /> <None Include="Interfaces\basicTests\0.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\basicTests\1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\basicTests\2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\basicTests\4.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\basicTests\5.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\basicTests\6.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\basicTests\7.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\GraphicObject\0.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\GraphicObject\1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\GraphicObject\2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Container\0.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Container\1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Container\2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Stack\0.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Stack\1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Stack\2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Stack\3.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Container\3.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Group\0.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Group\1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Group\2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Group\3.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Group\4.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Stack\0h.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Stack\1h.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Stack\2h.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Stack\3h.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Stack\4.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\4.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\5.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\6.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\clip0.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\clip1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\clip2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\clip3.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\clip4.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\fps.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test_Listbox.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test_stack.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test0.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test1.1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test1.2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test2WayBinding.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test3.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test5.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\test7.crow"> <LogicalName>Tests.Interfaces.test7.goml</LogicalName> @@ -231,118 +295,157 @@ </None> <None Include="Interfaces\Divers\testAll.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testBorder.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testButton.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testCheckbox.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testCombobox.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testContainer.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testGrid.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testGroupBox.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testHStack.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testPopper.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testRadioButton.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testScrollbar.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testSpinner.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testStacks.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testTextBox.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testWindow.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testWindow2.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Divers\testWindow3.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testColorList.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\test4.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\test6.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\test4.1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testMsgBox.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testOutOfClipUpdate.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testFileDialog.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testImage.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testDirViewer.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testTabView.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testTypeViewer.goml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testLabel.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Nouveau dossier\testRadioButton2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Expandable\1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Expandable\0.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Expandable\7.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Expandable\2.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> - <None Include="GOLIBTestsOTK.cs" /> <None Include="Interfaces\Nouveau dossier\testTreeView.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> <None Include="Interfaces\Splitter\1.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <LogicalName></LogicalName> </None> - <None Include="Interfaces\Splitter\1 %28copier%29.crow"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <None Include="OpenTK.dll.config"> + <LogicalName></LogicalName> + </None> + <None Include="GOLIBTestsOTK.cs"> + <LogicalName></LogicalName> </None> </ItemGroup> <ItemGroup> @@ -373,10 +476,6 @@ <Project>{C2980F9B-4798-4C05-99E2-E174810F7C7B}</Project> <Name>Crow</Name> </ProjectReference> - <ProjectReference Include="..\OTKCrow\OTKCrow.csproj"> - <Project>{350D4F49-9901-4998-9903-BCA7D48DA58C}</Project> - <Name>OTKCrow</Name> - </ProjectReference> <ProjectReference Include="..\GLCrow\GLCrow.csproj"> <Project>{66376B95-9351-4A63-B920-F4BB53FEF0E2}</Project> <Name>GLCrow</Name> 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; |