aboutsummaryrefslogtreecommitdiffstatsci
diff options
context:
space:
mode:
authorj-p <jp.bruyere@live.be>2016-07-27 16:53:29 +0200
committerGitHub <noreply@github.com>2016-07-27 16:53:29 +0200
commitc62546bc65ebe9babfd2068cebcbcc293b2d7aeb (patch)
tree75d3384e6debec153afd936e0765f7fbe43532fc
parent55824e2d4fa575f45a129ba4d8f073c7fb5b0d34 (diff)
parentcf1d65639b1c7e788bce8392f946cbe9399b4eda (diff)
Merge pull request #9 from jpbruyere/appveyor
Appveyor tests merge
-rw-r--r--.nuget/packages.config2
-rw-r--r--Crow.OpenTK.nuspec5
-rw-r--r--Crow.csproj408
-rw-r--r--Styles/Window.style3
-rw-r--r--Tests/HelloCube.cs4
-rw-r--r--Tests/Tests.csproj89
-rw-r--r--appveyor.yml100
-rw-r--r--src/GraphicObjects/GraphicObject.cs2
-rw-r--r--src/Interface.cs6
9 files changed, 199 insertions, 420 deletions
diff --git a/.nuget/packages.config b/.nuget/packages.config
index e54f7e70..2489a487 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="gtk-sharp.Linux.3.14" version="3.14.7" targetFramework="net45" />
+ <package id="GtkSharp" version="3.1.3" targetFramework="net45" />
<package id="OpenTK.Next" version="1.2.2336.6514-pre" targetFramework="net45" />
</packages>
diff --git a/Crow.OpenTK.nuspec b/Crow.OpenTK.nuspec
index 7bc58240..ba664df2 100644
--- a/Crow.OpenTK.nuspec
+++ b/Crow.OpenTK.nuspec
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>Crow.OpenTK</id>
- <version>0.4.3</version>
+ <version>0.4.5</version>
<title>C# Rapid Open Widget Toolkit</title>
<authors>JP Bruyere</authors>
<owners>Grand Tetras Software Team</owners>
@@ -13,6 +13,7 @@
<description>
CROW is a pure C# widget toolkit with templates, styles, compositing, and bindings.
Crow.OpenTK is the OpenTK ready version.
+It runs with Mono FrameWork >= 4.0.
This package depends on a pre-release OpenTK version, ensure pre-release packages are visible in your nuget client when adding Crow package.
</description>
<summary>
@@ -25,7 +26,7 @@ For more information, please visit https://jpbruyere.github.io/Crow/.
<copyright>Copyright 2016</copyright>
<dependencies>
<dependency id="OpenTK.Next" version="1.2" />
- <dependency id="gtk-sharp.Linux.3.14" version="3.14" />
+ <dependency id="GtkSharp" version="3.1" />
</dependencies>
<tags>Crow OpenTK OpenGL Widget Interface GUI C# .Net Mono</tags>
<references>
diff --git a/Crow.csproj b/Crow.csproj
index 68f67ca6..e351c246 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -22,9 +22,9 @@
<BaseAddress>4194304</BaseAddress>
<ReleaseVersion>0.4</ReleaseVersion>
<ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <OutputPath>$(SolutionDir)/build/$(Configuration)</OutputPath>
- <IntermediateOutputPath>$(SolutionDir)/build/obj/$(Configuration)</IntermediateOutputPath>
+ <SchemaVersion>2.0</SchemaVersion>
+ <OutputPath>$(SolutionDir)build\$(Configuration)</OutputPath>
+ <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -39,288 +39,100 @@
<DefineConstants>__linux__;MEASURE_TIME</DefineConstants>
</PropertyGroup>
<ItemGroup>
- <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>
- <Compile Include="src\CompilerServices\MemberReference.cs">
- <LogicalName></LogicalName>
- </Compile>
- <Compile Include="src\CompilerServices\Bindings.cs">
- <LogicalName></LogicalName>
- </Compile>
+ <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\CompilerServices\MemberReference.cs" />
+ <Compile Include="src\CompilerServices\Bindings.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
@@ -328,33 +140,21 @@
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Drawing" />
- <Reference Include="atk-sharp">
- <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\atk-sharp.dll</HintPath>
- </Reference>
<Reference Include="cairo-sharp">
- <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\cairo-sharp.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\cairo-sharp.dll</HintPath>
</Reference>
<Reference Include="gdk-sharp">
- <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gdk-sharp.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\gdk-sharp.dll</HintPath>
</Reference>
<Reference Include="gio-sharp">
- <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gio-sharp.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\gio-sharp.dll</HintPath>
</Reference>
<Reference Include="glib-sharp">
- <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\glib-sharp.dll</HintPath>
- </Reference>
- <Reference Include="gtk-dotnet">
- <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gtk-dotnet.dll</HintPath>
- </Reference>
- <Reference Include="gtk-sharp">
- <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gtk-sharp.dll</HintPath>
- </Reference>
- <Reference Include="pango-sharp">
- <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\pango-sharp.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\glib-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="packages\gtk-sharp.Linux.3.14.3.14.7\build\net40\gtk-sharp.Linux.3.14.targets" Condition="Exists('packages\gtk-sharp.Linux.3.14.3.14.7\build\net40\gtk-sharp.Linux.3.14.targets')" />
+ <Import Project="$(SolutionDir)packages\GtkSharp.3.1.3\build\net45\GtkSharp.targets" Condition="Exists('$(SolutionDir)packages\GtkSharp.3.1.3\build\net45\GtkSharp.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
@@ -451,8 +251,6 @@
<EmbeddedResource Include="Images\Icons\crow.svg" />
</ItemGroup>
<ItemGroup>
- <None Include="README.md">
- <LogicalName></LogicalName>
- </None>
+ <None Include="README.md" />
</ItemGroup>
</Project>
diff --git a/Styles/Window.style b/Styles/Window.style
index f0032e46..bfe18f08 100644
--- a/Styles/Window.style
+++ b/Styles/Window.style
@@ -1,3 +1,4 @@
Focusable=true
+Width=150
+Height=150
MinimumSize=50;50
-Fit=true
diff --git a/Tests/HelloCube.cs b/Tests/HelloCube.cs
index 4ecd56b8..e45e8d30 100644
--- a/Tests/HelloCube.cs
+++ b/Tests/HelloCube.cs
@@ -66,9 +66,7 @@ namespace Tests
CrowInterface.AddWidget(
new Window ()
{
- Title = "Hello World",
- Width = 200,
- Height = 200
+ Title = "Hello World"
}
);
initGL ();
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 48427086..042e202f 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -8,12 +8,12 @@
<OutputType>Exe</OutputType>
<RootNamespace>Tests</RootNamespace>
<AssemblyName>Tests</AssemblyName>
- <StartupObject>Tests.HelloWorld</StartupObject>
+ <StartupObject>Tests.HelloCube</StartupObject>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ReleaseVersion>0.4</ReleaseVersion>
- <OutputPath>$(SolutionDir)/build/$(Configuration)</OutputPath>
- <IntermediateOutputPath>$(SolutionDir)/build/obj/$(Configuration)</IntermediateOutputPath>
+ <ReleaseVersion>0.4</ReleaseVersion>
+ <OutputPath>$(SolutionDir)build/$(Configuration)</OutputPath>
+ <IntermediateOutputPath>$(SolutionDir)build/obj/$(Configuration)</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -30,105 +30,127 @@
<WarningLevel>0</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <Import Project="..\packages\gtk-sharp.Linux.3.14.3.14.7\build\net40\gtk-sharp.Linux.3.14.targets" Condition="Exists('..\packages\gtk-sharp.Linux.3.14.3.14.7\build\net40\gtk-sharp.Linux.3.14.targets')" />
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="System.Drawing" />
- <Reference Include="OpenTK">
- <HintPath>..\packages\OpenTK.Next.1.2.2336.6514-pre\lib\net20\OpenTK.dll</HintPath>
- </Reference>
- <Reference Include="atk-sharp">
- <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\atk-sharp.dll</HintPath>
- </Reference>
<Reference Include="cairo-sharp">
- <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\cairo-sharp.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\cairo-sharp.dll</HintPath>
</Reference>
<Reference Include="gdk-sharp">
- <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gdk-sharp.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\gdk-sharp.dll</HintPath>
</Reference>
<Reference Include="gio-sharp">
- <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gio-sharp.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\gio-sharp.dll</HintPath>
</Reference>
<Reference Include="glib-sharp">
- <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\glib-sharp.dll</HintPath>
- </Reference>
- <Reference Include="gtk-dotnet">
- <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gtk-dotnet.dll</HintPath>
+ <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\glib-sharp.dll</HintPath>
</Reference>
- <Reference Include="gtk-sharp">
- <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gtk-sharp.dll</HintPath>
- </Reference>
- <Reference Include="pango-sharp">
- <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\pango-sharp.dll</HintPath>
+ <Reference Include="OpenTK">
+ <HintPath>$(SolutionDir)packages\OpenTK.Next.1.2.2336.6514-pre\lib\net20\OpenTK.dll</HintPath>
</Reference>
</ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)packages\GtkSharp.3.1.3\build\net45\GtkSharp.targets" Condition="Exists('$(SolutionDir)packages\GtkSharp.3.1.3\build\net45\GtkSharp.targets')" />
<ItemGroup>
- <Compile Include="Interfaces\testBorder.goml.cs"/>
- <Compile Include="BasicTests.cs"/>
- <Compile Include="OpenGL\Shader.cs"/>
- <Compile Include="OpenGL\vaoMesh.cs"/>
- <Compile Include="OpenTKGameWindow.cs"/>
- <Compile Include="OpenGL\Texture.cs"/>
- <Compile Include="HelloWorld.cs"/>
- <Compile Include="HelloCube.cs"/>
+ <Compile Include="Interfaces\testBorder.goml.cs">
+ <LogicalName></LogicalName>
+ </Compile>
+ <Compile Include="BasicTests.cs">
+ <LogicalName></LogicalName>
+ </Compile>
+ <Compile Include="OpenGL\Shader.cs">
+ <LogicalName></LogicalName>
+ </Compile>
+ <Compile Include="OpenGL\vaoMesh.cs">
+ <LogicalName></LogicalName>
+ </Compile>
+ <Compile Include="OpenTKGameWindow.cs">
+ <LogicalName></LogicalName>
+ </Compile>
+ <Compile Include="OpenGL\Texture.cs">
+ <LogicalName></LogicalName>
+ </Compile>
+ <Compile Include="HelloWorld.cs">
+ <LogicalName></LogicalName>
+ </Compile>
+ <Compile Include="HelloCube.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="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>
@@ -437,6 +459,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<LogicalName></LogicalName>
</None>
+ <None Include="packages.config">
+ <LogicalName></LogicalName>
+ </None>
</ItemGroup>
<ItemGroup>
<Folder Include="Interfaces\" />
diff --git a/appveyor.yml b/appveyor.yml
index 7914327b..0abbb4a2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,82 +1,38 @@
-#
-# Appveyor configuration file for CI build of Mono on Windows (under Cygwin)
-#
-# For further details see http://www.appveyor.com
-#
-
-#
-# Custom environment variables
-#
-environment:
- global:
- CYG_ROOT: C:\cygwin
- CYG_MIRROR: http://cygwin.mirror.constant.com
- CYG_CACHE: C:\cygwin\var\cache\setup
- CYG_BASH: C:\cygwin\bin\bash
+version: 0.4.{build}
-#
-# Cache Cygwin files to speed up build
-#
-cache:
- - '%CYG_CACHE%'
+branches:
+ only:
+ - appveyor
-#
-# Do a shallow clone of the repo to speed up build
-#
clone_depth: 1
-version: 0.4.{build}
-#
-# Initialisation prior to pulling the Mono repository
-# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
-#
-init:
- - git config --global core.autocrlf input
-
-#
-# Install needed build dependencies
-#
-install:
- - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
- - 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages autoconf,automake,bison,gcc-core,gcc-g++,mingw-runtime,mingw-binutils,mingw-gcc-core,mingw-gcc-g++,mingw-pthreads,mingw-w32api,libtool,make,python,gettext-devel,gettext,intltool,libiconv,pkg-config,git,curl,libxslt > NUL 2>&1'
- - '%CYG_BASH% -lc "cygcheck -dc cygwin"'
-
before_build:
- cmd: nuget restore
-# Cygwin build script
-#
-# NOTES:
-#
-# The stdin/stdout file descriptor appears not to be valid for the Appveyor
-# build which causes failures as certain functions attempt to redirect
-# default file handles. Ensure a dummy file descriptor is opened with 'exec'.
-#
+#- cmd: C:\"Program Files (x86)"\Mono\lib\mono\4.5\xbuild /p:Configuration=Release Crow.sln
+#- cmd: reg add HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\SKUs\.NETFramework /v Version /t REG_SZ /d "v4.0" /f
+#- cmd: reg add HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\SKUs\.NETFramework /v Profile /t REG_SZ /d "Mono" /f
+#- cmd: reg add HKLM\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\SKUs\.NETFramework /v Version /t REG_SZ /d "v4.0" /f
+#- cmd: reg add HKLM\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\SKUs\.NETFramework /v Profile /t REG_SZ /d "Mono" /f
+#- cmd: mklink /d "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\Profile\Mono" "C:\Program Files (x86)\Mono\lib\mono\4.5"
+#- cmd: mkdir "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\Profile\Mono\RedistList"
+#- cmd: echo "<?xml version='1.0' encoding='utf-8'?><FileList Redist='Mono-4.5' Name='Mono 4.5 Profile' RuntimeVersion='4.5' ToolsVersion='4.0' > </FileList>" > "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\Profile\Mono\RedistList\FrameworkList.xml"
+
+
+#- cmd: dir "C:\Program Files (x86)\Mono\lib\mono\4.5"
+
build_script:
- - 'echo Building...'
- - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; xbuild /p:Configuration=Release Crow.sln"'
-# - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
-# - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make -j2"'
-# - 'echo Installing...'
-# - 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
-# - '%CYG_BASH% -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
+ - echo building...
+ - set XBUILD_FRAMEWORK_FOLDERS_PATH="C:\Program Files (x86)\Mono\lib\mono\4.5\"
+ - echo %XBUILD_FRAMEWORK_FOLDERS_PATH%
+ - echo ........................
+ - dir C:\"Program Files (x86)"\Mono\lib\mono\4.5\
+ - set path=%path%;C:\"Program Files (x86)"\Mono\lib\mono\4.5\
+ - xbuild /p:Configuration=Release Crow.sln /p:BuildWithMono="true"
-#
-# Disable tests for now
-#
-test: off
+#build: off
-#
-# Only build the master branch
-#
-branches:
- only:
- - master
+build:
+
+# project: Crow.sln
-#
-# NOTE: Currently this is the Mono installation tree. In future we will create an installation package artifact.
-# It has to be relative to the project path. Thus we have installed to within the build tree.
-#
-#artifacts:
-# - path: install
-# name: mono-binaries
-# type: zip
+ verbosity: normal
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 2838f6cd..e72a2caf 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -147,7 +147,7 @@ namespace Crow
return
Parent.ScreenCoordinates(r) + Parent.getSlot().Position + Parent.ClientRectangle.Position;
}
- public virtual Rectangle getSlot() => Slot;
+ public virtual Rectangle getSlot () { return Slot;}
#endregion
#region EVENT HANDLERS
diff --git a/src/Interface.cs b/src/Interface.cs
index b8426e6f..30fa4b74 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -749,8 +749,8 @@ namespace Crow
}
public void RegisterForLayouting (LayoutingType layoutType) { throw new NotImplementedException (); }
public bool UpdateLayout (LayoutingType layoutType) { throw new NotImplementedException (); }
- public Rectangle ContextCoordinates (Rectangle r) => r;
- public Rectangle ScreenCoordinates (Rectangle r) => r;
+ public Rectangle ContextCoordinates (Rectangle r) { return r;}
+ public Rectangle ScreenCoordinates (Rectangle r) { return r; }
public ILayoutable Parent {
get { return null; }
@@ -767,7 +767,7 @@ namespace Crow
public Interface HostContainer {
get { return this; }
}
- public Rectangle getSlot () => ClientRectangle;
+ public Rectangle getSlot () { return ClientRectangle; }
#endregion
}
}