test color list

diff --git a/Crow.userprefs b/Crow.userprefs
index cdb46ef86776f4d00b23ad9e429433694a3d81a4..54c7b2e0a992124090a3bcb6bfb89d4f344bce20 100644 (file)
--- a/Crow.userprefs
+++ b/Crow.userprefs
@@ -1,12 +1,13 @@
 <Properties GitUserInfo="UsingGIT" StartupItem="Tests/Tests.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|Linux_x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Tests/Interfaces/testWindow.goml">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Tests/GOLIBTests.cs">
     <Files>
-      <File FileName="Tests/Interfaces/testWindow.goml" Line="5" Column="35" />
-      <File FileName="src/GraphicObjects/Slider.cs" Line="1" Column="1" />
-      <File FileName="src/GraphicObjects/GraphicObject.cs" Line="1" Column="1" />
-      <File FileName="Tests/GOLIBTests.cs" Line="1" Column="1" />
-      <File FileName="src/Fill/Fill.cs" Line="1" Column="1" />
+      <File FileName="Tests/Interfaces/testColorList.crow" Line="21" Column="1" />
+      <File FileName="src/GraphicObjects/ListBox.cs" Line="36" Column="34" />
+      <File FileName="Tests/GOLIBTests.cs" Line="131" Column="31" />
+      <File FileName="src/GraphicObjects/GraphicObject.cs" Line="968" Column="1" />
+      <File FileName="Tests/Interfaces/colorItem.crow" Line="2" Column="41" />
+      <File FileName="src/Colors.cs" Line="143" Column="3" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
@@ -28,6 +29,7 @@
     <Watch file="src/CompilerServices/CompilerServices.cs" line="88" offsetX="630" offsetY="1184" expression="Expression" liveUpdate="False" />
     <Watch file="src/GraphicObjects/GraphicObject.cs" line="394" offsetX="672" offsetY="1844" expression="pi.Name" liveUpdate="False" />
     <Watch file="src/GraphicObjects/GenericStack.cs" line="108" offsetX="495" offsetY="1377" expression="layoutType" liveUpdate="False" />
+    <Watch file="src/Colors.cs" line="148" offsetX="367" offsetY="561" expression="R" liveUpdate="False" />
   </MonoDevelop.Ide.DebuggingService.PinnedWatches>
   <AuthorInfo Name="Jean-Philippe Bruyère" Email="jp_bruyere@hotmail.com" Copyright="jp" Company="" Trademark="" />
 </Properties>
\ No newline at end of file

diff --git a/Templates/ArrowButTemplate.crow b/Templates/ArrowButTemplate.crow
index 099249c3bba064950f36db4d3d9dc788cecba3c0..c90f1b60ddd91a249497e1dac9246f76b17b2cbe 100755 (executable)
--- a/Templates/ArrowButTemplate.crow
+++ b/Templates/ArrowButTemplate.crow
@@ -4,11 +4,11 @@
        <Label Text="{../../Caption}" Height="80" Width="200"/>
 </HorizontalStack>-->
 <Border Name="Content"
-       Background="vgradient|0:White|0,2:Gray|0,9:Gray|1:Black" Foreground="DarkGray" 
+       Background="vgradient|0:White|0,1:LightGray|0,9:LightGray|1:Black" Foreground="DarkGray" 
        Height="{../TemplatedHeight}" Width="{../TemplatedWidth}"
        MouseEnter="{Foreground=White}"
        MouseLeave="{Foreground=DarkGray}"
-       MouseDown="{Background=vgradient|0:Black|0,1:Gray|0,9:Gray|1:White}"
-       MouseUp="{Background=vgradient|0:White|0,2:Gray|0,9:Gray|1:Black}"
+       MouseDown="{Background=vgradient|0:Black|0,1:LightGray|0,9:LightGray|1:White}"
+       MouseUp="{Background=vgradient|0:White|0,1:LightGray|0,9:LightGray|1:Black}"
        >
 </Border>
\ No newline at end of file

diff --git a/Templates/ScrollBar.goml b/Templates/ScrollBar.goml
index 4734eea9c737076db87f6738d748569ea3f29395..15dd9b963d9f3868d525c62869f179bd7a2e856f 100755 (executable)
--- a/Templates/ScrollBar.goml
+++ b/Templates/ScrollBar.goml
@@ -6,7 +6,7 @@
                        <Image Margin="1" Path="#Crow.Images.Icons.updown.svg" SvgSub="up"/>
                </Button>
                <Slider Name="Slider" Value="{../../../Scroll}" Maximum="{../../../MaximumScroll}"
-                       Background="hgradient|0:Black|0,1:Gray|0,9:Gray|1:LightGray"
+                       Background="hgradient|0:DimGray|0,1:Gray|0,95:Gray|1:White"
                        Width="{../../../TemplatedWidth}" Height="{../../../TemplatedHeight}" Orientation="{../../../Orientation}"
                        ValueChanged="../../../onSliderValueChange"/>
                <Button MouseRepeat="true" Width="12" Height="8" MouseClick="../../../onScrollForth"

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 3a198fcb3b9c9eb1cb57d21fed4a2a98e4c1c2de..41b7eb5e0aea94c89f7f19003333532a12dcb04b 100644 (file)
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -13,6 +13,7 @@ using System.Diagnostics;
 using Crow;
 using System.Threading;
 using System.Collections.Generic;
+using System.Linq;
 
 
 namespace test
@@ -36,10 +37,13 @@ namespace test
                int frameCpt = 0;
                int idx = 0;
                string[] testFiles = {
+                       "testColorList.crow",
+                       "test_Listbox.goml",
+                       "testButton.crow",
                        "testBorder.goml",
+                       "testButton2.crow",
                        "testGroupBox.goml",
                        "test2WayBinding.crow",
-                       "testButton.crow",
                        "0.crow",
                        "testSpinner.goml",
                        "fps.goml",
@@ -65,7 +69,6 @@ namespace test
                        "testMsgBox.goml",
                        "testGrid.goml",
                        "testMeter.goml",
-                       "test_Listbox.goml",
                };
 
                #region FPS
@@ -124,12 +127,9 @@ namespace test
                                return;
                        intValue = Convert.ToInt32(e.NewValue);
                }
-               public List<String> TestList = new List<string>( new string[] 
-                       {
-                               "string 1",
-                               "string 2",
-                               "string 3"
-                       });     
+               public IList<Color> TestList {
+                       get { return Color.ColorDic; }
+               }
 
                protected override void OnLoad (EventArgs e)
                {
@@ -138,6 +138,7 @@ namespace test
 
                        GraphicObject obj = LoadInterface("Interfaces/" + testFiles[idx]);
                        obj.DataSource = this;
+
                }
                protected override void OnUpdateFrame (FrameEventArgs e)
                {

diff --git a/Tests/Interfaces/colorItem.crow b/Tests/Interfaces/colorItem.crow
new file mode 100755 (executable)
index 0000000..9901ddf
--- /dev/null
+++ b/Tests/Interfaces/colorItem.crow
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<HorizontalStack Height="-1" Width="200"
+       MouseEnter="{Background=SteelBlue}"
+       MouseLeave="{Background=Transparent}">
+       <GraphicObject Height="10" Width="30" Background="{}"/>
+       <TextRun Text="{Name}"/>
+</HorizontalStack>
+

diff --git a/Tests/Interfaces/testButton.crow b/Tests/Interfaces/testButton.crow
index fd52bce435b34c3327c33249707fe7ea8a5e493f..69367eaaeeff0b1a315c4a98168f987ee0168f4e 100755 (executable)
--- a/Tests/Interfaces/testButton.crow
+++ b/Tests/Interfaces/testButton.crow
@@ -2,321 +2,9 @@
 <VerticalStack Fit="true" Background="vgradient|0:DimGray|1:Black">
        <HorizontalStack Fit="True">
                <Button Caption="but" MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>      <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-       </HorizontalStack>
-       <HorizontalStack Fit="True">
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
-               <Button MouseClick="onButClick"/>
+               <Button Caption="but" MouseClick="onButClick" Fit="true"/>
+               <Button Width="60" Height="40" MouseClick="onButClick"/>
+               <Button Caption="Long text button" MouseClick="onButClick"/>
+               <Button Font="droid, 20" Caption="Button"/>
        </HorizontalStack>
 </VerticalStack>
\ No newline at end of file

diff --git a/Tests/Interfaces/testColorList.crow b/Tests/Interfaces/testColorList.crow
new file mode 100755 (executable)
index 0000000..1eb7437
--- /dev/null
+++ b/Tests/Interfaces/testColorList.crow
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<Border BorderWidth="2" Fit="true">
+       <VerticalStack Fit="true" Margin="5">
+               <ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,5"
+                                        HorizontalAlignment="Center" Width="-1" Height="350" Margin="5"
+                                        ItemTemplate="#Tests.Interfaces.colorItem.crow">
+                       <Template>
+                               <Border BorderWidth="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
+                                       <HorizontalStack Margin="1" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}" >
+                                               <Scroller Name="scroller1" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" 
+                                                               Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">
+                                                       <VerticalStack Width="{../../../../TemplatedWidth}" Height="-1" MinimumSize="100;100"
+                                                               Name="List" Margin="0" VerticalAlignment="Top" />
+                                               </Scroller>
+                                               <ScrollBar Name="scrollbar1" Scroll="{../scroller1.ScrollY}" 
+                                                       MaximumScroll="{../scroller1.MaximumScroll}" Orientation="Vertical" 
+                                                       Width="10" Height="{../../../TemplatedHeight}" />
+                                       </HorizontalStack>
+                               </Border>
+                       </Template>
+               </ListBox>
+               <HorizontalStack Fit="true" HorizontalAlignment="Right">
+                       <Button Caption="Load list" MouseClick="OnLoadList"/>
+                       <Button Caption="Clear" MouseClick="OnClear"/>
+               </HorizontalStack>
+       </VerticalStack>
+</Border>
\ No newline at end of file

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index e0c3f14c2a91f48efd95cde40e704e713a0600fb..3e25ee30635eec9d0adf854bb655e58cb16579fa 100644 (file)
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -209,6 +209,12 @@
     <None Include="Interfaces\test2WayBinding.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\testButton2.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\testColorList.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interfaces\" />
@@ -219,6 +225,9 @@
     <EmbeddedResource Include="image\folder0.svg" />
     <EmbeddedResource Include="image\folder1.svg" />
     <EmbeddedResource Include="image\crow0.svg" />
+    <EmbeddedResource Include="Interfaces\colorItem.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Crow.csproj">

diff --git a/src/GraphicObjects/Slider.cs b/src/GraphicObjects/Slider.cs
index f21202a8f643113c0a9d0f3f996c369fdff0c90e..d0a56d9d147c6a39b38eb166f03d1cbf0eca57f0 100644 (file)
--- a/src/GraphicObjects/Slider.cs
+++ b/src/GraphicObjects/Slider.cs
@@ -40,7 +40,7 @@ namespace Crow
                protected double unity;
 
                #region Public properties
-               [XmlAttributeAttribute()][DefaultValue("vgradient|0:White|0,1:SteelBlue|0,9:SteelBlue|1:DimGray")]
+               [XmlAttributeAttribute()][DefaultValue("vgradient|0:White|0,1:LightGray|0,9:LightGray|1:DimGray")]
                public virtual Fill CursorColor {
                        get { return _cursorColor; }
                        set {