diff options
| author | j-p <jp.bruyere@live.be> | 2018-12-11 23:20:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 23:20:54 +0100 |
| commit | eef19b533a0e2ce17f2762d3acfc5990496eaaa0 (patch) | |
| tree | 6f09101bd8097c1a4ca6a216597bb5d4941453fa /Tests/Interfaces | |
| parent | 65820f61457262b631eba35283c55135aecbc5f2 (diff) | |
| parent | f6732851fe211e22ff91716ac83dffc0cf09d620 (diff) | |
Merge pull request #44 from jpbruyere/xlib
Xlib
Diffstat (limited to 'Tests/Interfaces')
64 files changed, 388 insertions, 271 deletions
diff --git a/Tests/Interfaces/CheckBox2.imlt b/Tests/Interfaces/CheckBox2.imlt index 4cb7f5f2..c2bfe8da 100644 --- a/Tests/Interfaces/CheckBox2.imlt +++ b/Tests/Interfaces/CheckBox2.imlt @@ -1,7 +1,7 @@ <Label Font="{./Font}" Text="{./Caption}" Height="{./HeightPolicy}" Width="{./WidthPolicy}" Margin="3" Background="{./Background}" - Foreground="DimGray" + Foreground="DimGrey" TextAlignment="Center" MouseEnter="{Foreground=White}" - MouseLeave="{Foreground=DimGray}"/>
\ No newline at end of file + MouseLeave="{Foreground=DimGrey}"/>
\ No newline at end of file diff --git a/Tests/Interfaces/Container/0.crow b/Tests/Interfaces/Container/0.crow index 17bc958e..df2f4733 100755 --- a/Tests/Interfaces/Container/0.crow +++ b/Tests/Interfaces/Container/0.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Container Background="DimGray" Margin="10" Width="90%" Height="90%"> +<Container Background="DimGrey" Margin="10" Width="90%" Height="90%"> <GraphicObject Margin="10" Background="SeaGreen" MinimumSize="50,50"/> </Container>
\ No newline at end of file diff --git a/Tests/Interfaces/Container/3.crow b/Tests/Interfaces/Container/3.crow index dd8afa28..94655ca3 100755 --- a/Tests/Interfaces/Container/3.crow +++ b/Tests/Interfaces/Container/3.crow @@ -1,4 +1,4 @@ <?xml version="1.0"?> -<Container Background="DimGray" Margin="10" Fit="true"> +<Container Background="DimGrey" Margin="10" Fit="true"> <Label Text="{fps}" Margin="10" Fit="true" Background="SeaGreen"/> </Container>
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/0.crow b/Tests/Interfaces/Divers/0.crow index d98668c0..16ec90f9 100755 --- a/Tests/Interfaces/Divers/0.crow +++ b/Tests/Interfaces/Divers/0.crow @@ -3,10 +3,10 @@ <HorizontalStack > <VerticalStack Width="30%" Margin="5"> <GroupBox Caption="Performance" Height="Fit"> - <VerticalStack Width="90%" Height="Fit" Spacing="2" > + <VerticalStack DataSource="{drawingMeasure}" Width="90%" Height="Fit" Spacing="2" > <HorizontalStack Height="Fit" Tooltip="Frame per second"> <Label Text="Fps:" Style="FpsLabel"/> - <Label Text="{fps}" Style="FpsDisp"/> + <Label Text="{minimum}" Style="FpsDisp"/> </HorizontalStack> <HorizontalStack Height="Fit" Tooltip="Minimum Frame per second"> <Label Text="Min:" Style="FpsLabel"/> @@ -34,9 +34,9 @@ </HorizontalStack> </VerticalStack> </GroupBox> - <Label Width="Stretched" Margin="3" Background="DimGray"/> + <Label Width="Stretched" Margin="3" Background="DimGrey"/> <TextBox Text="TextBox" Multiline="true" Margin="3"/> - <HorizontalStack Height="Fit" Margin="5" Background="DimGray" CornerRadius="10"> + <HorizontalStack Height="Fit" Margin="5" Background="DimGrey" CornerRadius="10"> <VerticalStack Spacing="5" Width="50%"> <CheckBox Fit="true" Caption="test"/> <CheckBox Fit="true"/> @@ -51,26 +51,26 @@ </VerticalStack> </HorizontalStack> <HorizontalStack Height="Fit" Margin="5"> - <Label Text="MouseEvents" Width="50%" Margin="3" + <Label Text="MouseEvents" Width="50%" Margin="3" Focusable="true" Background="Jet" - Foreground="DimGray" + Foreground="DimGrey" TextAlignment="Center" MouseEnter="{Foreground=White}" - MouseLeave="{Foreground=DimGray}" + MouseLeave="{Foreground=DimGrey}" MouseDown="{Background=DarkRed}" MouseClick="{Foreground=Green}" MouseDoubleClick="{Foreground=Yellow}" MouseUp="{Background=Jet}"/> <Label Text="MouseEvents" Width="50%" Margin="3" Background="Jet" - Foreground="DimGray" + Foreground="DimGrey" TextAlignment="Center" MouseClick="{Foreground=Green}" MouseDoubleClick="{Foreground=Yellow}" MouseEnter="{Foreground=White}" - MouseLeave="{Foreground=DimGray}" + MouseLeave="{Foreground=DimGrey}" MouseDown="{Background=SeaGreen}" - MouseUp="{Background=DimGray}"/> + MouseUp="{Background=DimGrey}"/> </HorizontalStack> <GroupBox Caption="Templated controls" Height="Fit" Margin="5"> <HorizontalStack Height="Fit"> @@ -101,20 +101,20 @@ <Splitter/> <VerticalStack Width="40%" Margin="5" Spacing="5"> <Expandable> - <Image Path="#Crow.Images.Icons.crow.svg"/> + <Image Path="#Crow.Icons.crow.svg"/> </Expandable> <Popper> - <Border Fit="True" Background="DimGray" CornerRadius="0" BorderWidth="1"> - <Image Path="#Crow.Images.Icons.crow.svg" Width="100" Height="100" Margin="10" - MouseEnter="{Background=LightGray}" + <Border Fit="True" Background="DimGrey" CornerRadius="0" BorderWidth="1"> + <Image Path="#Crow.Icons.crow.svg" Width="100" Height="100" Margin="10" + MouseEnter="{Background=LightGrey}" MouseLeave="{Background=Transparent}"/> </Border> </Popper> <Slider Height="10" Width="90%"/> - <Container Height="Fit" Width="200" Background="DimGray" Margin="2" CornerRadius="5"> - <ProgressBar Background="DimGray" Height="10" Value="50"/> + <Container Height="Fit" Width="200" Background="DimGrey" Margin="2" CornerRadius="5"> + <ProgressBar Background="DimGrey" Height="10" Value="50"/> </Container> - <Image Path="#Crow.Images.Icons.crow.svg" Width="60" Height="60" Background="LightGray" /> + <Image Path="#Crow.Icons.crow.svg" Width="60" Height="60" Background="LightGrey" /> <!-- <TabView Name="tabview1" Height="120" Orientation="Horizontal" Spacing="15"> <TabItem Name="TabItem1" Caption="Tab 1" Margin="0"> @@ -125,7 +125,7 @@ <CheckBox/> </VerticalStack> </TabItem> - <TabItem Name="TabItem2" Caption="Tab 2" Background="Gray"> + <TabItem Name="TabItem2" Caption="Tab 2" Background="Grey"> <VerticalStack Fit="true"> <RadioButton/> <RadioButton/> @@ -133,7 +133,7 @@ <RadioButton/> </VerticalStack> </TabItem> - <TabItem Name="TabItem3" Caption="Tab 3" Background="Gray"> + <TabItem Name="TabItem3" Caption="Tab 3" Background="Grey"> <Container Margin="5" CornerRadius="2"> <TextBox Height="Stretched" Margin="5" Multiline="true" TextAlignment="TopLeft"/> </Container> @@ -154,8 +154,8 @@ </Border> <Splitter/>--> <ListBox Name="colorList" Data="{TestList}" Margin="5" - ItemTemplate="#Tests.Interfaces.colorItem.crow" - Template="#Crow.Templates.ScrollingListBox.template" + ItemTemplate="Interfaces/colorItem.crow" + Template="#Crow.ScrollingListBox.template" /> </VerticalStack> </HorizontalStack> diff --git a/Tests/Interfaces/Divers/3.crow b/Tests/Interfaces/Divers/3.crow index 5ec5c696..a1f5e95d 100755 --- a/Tests/Interfaces/Divers/3.crow +++ b/Tests/Interfaces/Divers/3.crow @@ -1,7 +1,7 @@ <?xml version="1.0"?> <HorizontalStack Fit="true"> <VerticalStack Fit="true" Name="vsFps" Spacing="10" > - <ProgressBar CornerRadius="5" Background="DimGray" Margin="1" Maximum="1000" Value="{fps}" Width="200" Height="15"/> + <ProgressBar CornerRadius="5" Background="DimGrey" Margin="1" Maximum="1000" Value="{fps}" Width="200" Height="15"/> <HorizontalStack Fit="true"> <Label Text="Memory:" Width="50" TextAlignment="Right"/> <Label Text="{memory}" Font="droid,12" TextAlignment="Center" diff --git a/Tests/Interfaces/Divers/5.crow b/Tests/Interfaces/Divers/5.crow index 53040f93..7489642a 100755 --- a/Tests/Interfaces/Divers/5.crow +++ b/Tests/Interfaces/Divers/5.crow @@ -20,10 +20,10 @@ <GroupBox Caption="Group box" > <Label Text="border test" Margin="3"/> </GroupBox> - <Container Fit="true" Background="DimGray" Margin="3"> - <GraphicObject Width="20" Height="20" Background="LightGray"/> + <Container Fit="true" Background="DimGrey" Margin="3"> + <GraphicObject Width="20" Height="20" Background="LightGrey"/> </Container>--> -<!-- <ProgressBar Height="10" Width="150" Background="DimGray" Value="50" /> +<!-- <ProgressBar Height="10" Width="150" Background="DimGrey" Value="50" /> <Slider Value="5" Width="150" Height="10"/> <ScrollBar Orientation="Horizontal" Maximum="100" Value="50" Height="16" Width="150"/> <Spinner Value="100"/>--> @@ -48,10 +48,10 @@ <GroupBox Caption="Group box" Width="Stretched"> <Label Text="border test" Margin="3"/> </GroupBox> - <Container Height="Fit" Width="Stretched" Background="DimGray" Margin="3"> - <GraphicObject Width="20" Height="20" Background="LightGray"/> + <Container Height="Fit" Width="Stretched" Background="DimGrey" Margin="3"> + <GraphicObject Width="20" Height="20" Background="LightGrey"/> </Container> - <ProgressBar Height="10" Width="Stretched" Background="DimGray" Value="50" /> + <ProgressBar Height="10" Width="Stretched" Background="DimGrey" Value="50" /> <Slider Value="5" Width="Stretched" Height="10"/> <ScrollBar Orientation="Horizontal" Maximum="100" Value="50" Height="16" Width="Stretched"/> <Spinner Value="100" Width="Stretched"/> diff --git a/Tests/Interfaces/Divers/6.crow b/Tests/Interfaces/Divers/6.crow index c37ca360..f537a71d 100755 --- a/Tests/Interfaces/Divers/6.crow +++ b/Tests/Interfaces/Divers/6.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<VerticalStack Fit="true" Background="DimGray" Margin="5"> +<VerticalStack Fit="true" Background="DimGrey" Margin="5"> <!-- <RadioButton/>--> <Label Text="a" Width="Stretched" Background="Red"/> <Label Text="{fps}" HorizontalAlignment="Right" Background="LimeGreen"/> diff --git a/Tests/Interfaces/Divers/clip0.crow b/Tests/Interfaces/Divers/clip0.crow index 8cdf459b..0dee2ef1 100755 --- a/Tests/Interfaces/Divers/clip0.crow +++ b/Tests/Interfaces/Divers/clip0.crow @@ -1,10 +1,10 @@ <?xml version="1.0"?> <Container Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false" HorizontalAlignment="Right" VerticalAlignment="Bottom" - MouseEnter="{Background=Gray}" + MouseEnter="{Background=Grey}" MouseLeave="{Background=LimeGreen}"> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="false" - MouseEnter="{Background=DimGray}" Width="100" + MouseEnter="{Background=DimGrey}" Width="100" MouseLeave="{Background=RoyalBlue}" Margin="10" Text="{drawing}" Background="RoyalBlue"/> </Container>
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/clip1.crow b/Tests/Interfaces/Divers/clip1.crow index 1e202d90..bc4c9279 100755 --- a/Tests/Interfaces/Divers/clip1.crow +++ b/Tests/Interfaces/Divers/clip1.crow @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Container Fit="true" Margin="20" Background="SkyBlue" CacheEnabled="false" HorizontalAlignment="Right" VerticalAlignment="Bottom" - MouseEnter="{Background=LightGray}" + MouseEnter="{Background=LightGrey}" MouseLeave="{Background=SkyBlue}"> <Container Fit="true" Margin="20" Background="Red" CacheEnabled="true" HorizontalAlignment="Right" VerticalAlignment="Bottom" @@ -13,10 +13,10 @@ MouseLeave="{Background=Yellow}"> <Container Margin="50" Background="LimeGreen" CacheEnabled="true" HorizontalAlignment="Right" VerticalAlignment="Bottom" - MouseEnter="{Background=Gray}" + MouseEnter="{Background=Grey}" MouseLeave="{Background=LimeGreen}"> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" - MouseEnter="{Background=DimGray}" + MouseEnter="{Background=DimGrey}" MouseLeave="{Background=RoyalBlue}" Margin="1" Text="{drawing}" Background="RoyalBlue"/> </Container> diff --git a/Tests/Interfaces/Divers/clip2.crow b/Tests/Interfaces/Divers/clip2.crow index 198d9113..9292150f 100755 --- a/Tests/Interfaces/Divers/clip2.crow +++ b/Tests/Interfaces/Divers/clip2.crow @@ -1,14 +1,14 @@ <?xml version="1.0"?> <Group Fit="true" Margin="50" Background="Yellow" CacheEnabled="true" HorizontalAlignment="Right" VerticalAlignment="Bottom" - MouseEnter="{Background=DimGray}" + MouseEnter="{Background=DimGrey}" MouseLeave="{Background=Yellow}"> <Group Width="300" Height="200" Margin="50" Background="LimeGreen" CacheEnabled="false" HorizontalAlignment="Right" VerticalAlignment="Bottom" - MouseEnter="{Background=Gray}" + MouseEnter="{Background=Grey}" MouseLeave="{Background=LimeGreen}"> <Label Left="10" HorizontalAlignment="Right" VerticalAlignment="Center" CacheEnabled="true" - MouseEnter="{Background=DimGray}" Width="100" + MouseEnter="{Background=DimGrey}" Width="100" MouseLeave="{Background=RoyalBlue}" Margin="10" Text="{drawing}" Background="RoyalBlue"/> </Group> diff --git a/Tests/Interfaces/Divers/clip3.crow b/Tests/Interfaces/Divers/clip3.crow index 2bb7c357..82a98881 100755 --- a/Tests/Interfaces/Divers/clip3.crow +++ b/Tests/Interfaces/Divers/clip3.crow @@ -1,32 +1,32 @@ <?xml version="1.0"?> <Group Fit="true" Margin="50" Background="Yellow" CacheEnabled="true" HorizontalAlignment="Right" VerticalAlignment="Bottom" - MouseEnter="{Background=DimGray}" + MouseEnter="{Background=DimGrey}" MouseLeave="{Background=Yellow}"> <HorizontalStack Fit="true"> <VerticalStack Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false" HorizontalAlignment="Right" VerticalAlignment="Bottom" - MouseEnter="{Background=Gray}" + MouseEnter="{Background=Grey}" MouseLeave="{Background=LimeGreen}"> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" - MouseEnter="{Background=DimGray}" Width="100" + MouseEnter="{Background=DimGrey}" Width="100" MouseLeave="{Background=RoyalBlue}" Margin="10" Text="{fps}" Background="RoyalBlue"/> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" - MouseEnter="{Background=DimGray}" Width="100" + MouseEnter="{Background=DimGrey}" Width="100" MouseLeave="{Background=RoyalBlue}" Margin="10" Text="{drawing}" Background="RoyalBlue"/> </VerticalStack> <VerticalStack Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false" HorizontalAlignment="Right" VerticalAlignment="Bottom" - MouseEnter="{Background=Gray}" + MouseEnter="{Background=Grey}" MouseLeave="{Background=LimeGreen}"> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" - MouseEnter="{Background=DimGray}" Width="100" + MouseEnter="{Background=DimGrey}" Width="100" MouseLeave="{Background=RoyalBlue}" Margin="10" Text="{fpsMax}" Background="RoyalBlue"/> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" - MouseEnter="{Background=DimGray}" Width="100" + MouseEnter="{Background=DimGrey}" Width="100" MouseLeave="{Background=RoyalBlue}" Margin="10" Text="{fpsMin}" Background="RoyalBlue"/> </VerticalStack> diff --git a/Tests/Interfaces/Divers/clip4.crow b/Tests/Interfaces/Divers/clip4.crow index 71a887ab..5caaf771 100755 --- a/Tests/Interfaces/Divers/clip4.crow +++ b/Tests/Interfaces/Divers/clip4.crow @@ -1,38 +1,38 @@ <?xml version="1.0"?> <Border Fit="true" BorderWidth="2" > -<Scroller CornerRadius="2" Height="200" Width="300" Background="DimGray" Margin="2"> +<Scroller CornerRadius="2" Height="200" Width="300" Background="DimGrey" Margin="2"> <VerticalStack Margin="10" VerticalAlignment="Top" Fit="true" Background="vgradient|0:RoyalBlue|1:Black" > - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 1"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 2"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 3"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 4"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 5"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 6"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 7"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 8"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 9"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 10"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 11"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 12"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 13"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 14"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 15"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 16"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 17"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 18"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 19"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 20"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 21"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 22"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 23"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 24"/> - <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 25"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 1"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 2"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 3"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 4"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 5"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 6"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 7"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 8"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 9"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 10"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 11"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 12"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 13"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 14"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 15"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 16"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 17"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 18"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 19"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 20"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 21"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 22"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 23"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 24"/> + <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 25"/> </VerticalStack> </Scroller> </Border> <!--<VerticalStack Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false" HorizontalAlignment="Right" VerticalAlignment="Bottom" - MouseEnter="{Background=Gray}" + MouseEnter="{Background=Grey}" MouseLeave="{Background=LimeGreen}"> <CheckBox Margin="20" Background="RoyalBlue"/> @@ -48,11 +48,11 @@ <CheckBox/> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" - MouseEnter="{Background=DimGray}" Width="100" + MouseEnter="{Background=DimGrey}" Width="100" MouseLeave="{Background=RoyalBlue}" Margin="10" Text="{fps}" Background="RoyalBlue"/> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" - MouseEnter="{Background=DimGray}" Width="100" + MouseEnter="{Background=DimGrey}" Width="100" MouseLeave="{Background=RoyalBlue}" Margin="10" Text="{drawing}" Background="RoyalBlue"/> </VerticalStack>-->
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/colorPicker.crow b/Tests/Interfaces/Divers/colorPicker.crow index fdfd8f3c..a081946f 100755 --- a/Tests/Interfaces/Divers/colorPicker.crow +++ b/Tests/Interfaces/Divers/colorPicker.crow @@ -1,6 +1,6 @@ <?xml version="1.0"?> <VerticalStack> - <ColorPicker SelectedColor="{²../go.Background}" Name="colorPicker" Background="DimGray" Margin="5" Fit="True" /> + <ColorPicker SelectedColor="{²../go.Background}" Name="colorPicker" Background="DimGrey" Margin="5" Fit="True" /> <GraphicObject Name="go" Width="100" Height="60" Background="DarkBlue"/> <GraphicObject Name="go" Width="100" Height="60" Background="{../colorPicker.SelectedColor}"/> <Label Text="{../colorPicker.SelectedColor}"/> diff --git a/Tests/Interfaces/Divers/perfMeasures.crow b/Tests/Interfaces/Divers/perfMeasures.crow index c0d0d8b9..ec13cf0e 100755 --- a/Tests/Interfaces/Divers/perfMeasures.crow +++ b/Tests/Interfaces/Divers/perfMeasures.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Window Focusable="true" Caption="Measures" Width="30%" Height="Fit" MinimumSize="100,100"> +<Window Focusable="true" Caption="Measures" Width="30%" Height="300" MinimumSize="100,100"> <ListBox Data="{PerfMeasures}" ItemTemplate="#Tests.Interfaces.perfMsr.crow"/> </Window> diff --git a/Tests/Interfaces/Divers/testDisable.crow b/Tests/Interfaces/Divers/testDisable.crow index 85a3d3b9..68d1cebb 100644 --- a/Tests/Interfaces/Divers/testDisable.crow +++ b/Tests/Interfaces/Divers/testDisable.crow @@ -6,8 +6,8 @@ <Label Text="{fps}" IsEnabled="true" Font="30"/> <Label Text="{fps}" IsEnabled="false" Font="30" Background="SeaGreen"/> <Label Text="{fps}" IsEnabled="true" Font="30" Background="SeaGreen"/> - <Button Caption="Button" IsEnabled="true" Background="Gray"/> - <Button Caption="Button" IsEnabled="false" Background="Gray"/> + <Button Caption="Button" IsEnabled="true" Background="Grey"/> + <Button Caption="Button" IsEnabled="false" Background="Grey"/> <Button Caption="Button" IsEnabled="true" /> <Button Caption="Button" IsEnabled="false" /> <Spinner Fit="true"/> diff --git a/Tests/Interfaces/Divers/testFocus.crow b/Tests/Interfaces/Divers/testFocus.crow new file mode 100755 index 00000000..97a57457 --- /dev/null +++ b/Tests/Interfaces/Divers/testFocus.crow @@ -0,0 +1,82 @@ +<?xml version="1.0"?> +<VerticalStack> + <Menu> + <MenuItem Caption="File" Width="Fit"> + <MenuItem Command="{CMDTest}"/> + <MenuItem Caption="Open"/> + <MenuItem Caption="Save"/> + <MenuItem Caption="Quit"/> + </MenuItem> + <MenuItem Caption="Edit" Name="edit" Width="Fit"> + <MenuItem Caption="Cut"/> + <MenuItem Caption="Copy"/> + <MenuItem Caption="Paste"/> + <MenuItem Caption="Special" Name="special" Width="Fit"> + <MenuItem Caption="Cut"/> + <MenuItem Caption="Copy"/> + <MenuItem Caption="Paste"/> + </MenuItem> + <MenuItem Caption="Special2" Name="special" Width="Fit"> + <MenuItem Caption="Cut"/> + <MenuItem Caption="Copy"/> + <MenuItem Caption="Paste"/> + </MenuItem> + </MenuItem> + <MenuItem Caption="Help" Width="Fit"> + <MenuItem Caption="About"/> + <MenuItem Caption="Help"/> + </MenuItem> + </Menu> + <HorizontalStack Height="Fit"> + <Label Text="Hover:" Width="50" Foreground="Grey"/> + <Label Text="{HoverWidget}"/> + </HorizontalStack> + <HorizontalStack Height="Fit"> + <Label Text="Focus:" Width="50" Foreground="Grey"/> + <Label Text="{FocusedWidget}"/> + </HorizontalStack> + <HorizontalStack Height="Fit"> + <Label Text="Active:" Width="50" Foreground="Grey"/> + <Label Text="{ActiveWidget}"/> + </HorizontalStack> + <Container Fit="true" Margin="50" Background="SlateGrey"> + <Label Text="MouseEvents" Margin="3" Focusable="true" Fit="true" + Background="Jet" + Foreground="DimGrey" + TextAlignment="Center" + MouseEnter="{Foreground=White}" + MouseLeave="{Foreground=DimGrey}" + MouseDown="{Background=DarkRed}" + MouseClick="{Foreground=Green}" + MouseDoubleClick="{Foreground=Yellow}" + MouseUp="{Background=Jet}"/> + </Container> + <TextBox Width="300" Margin="10"/> + <Slider Width="300" Height="12"/> + <ComboBox Data="{TestList}" Width="120"> + <ItemTemplate DataType="Crow.Color"> + <HorizontalStack + HorizontalAlignment="Left" + Height="Fit" Width="200" Margin="1" Focusable="true" + MouseEnter="{Background=hgradient|0:DarkRed|1:Transparent}" + MouseLeave="{Background=Transparent}"> + <GraphicObject Height="12" Width="20" Background="{}" Margin="0" CornerRadius="3"/> + <Label Text="{}" Margin="0" Width="Stretched"/> + </HorizontalStack> + </ItemTemplate> + </ComboBox> + <HorizontalStack Height="Fit" Margin="1" Background="DimGrey" Width="200"> + <VerticalStack Spacing="2" Width="50%"> + <CheckBox Caption="test" MouseEnter="{Background=Blue}" MouseLeave="{Background=Transparent}"/> + <CheckBox /> + <CheckBox /> + <CheckBox IsChecked="true"/> + </VerticalStack> + <VerticalStack Spacing="2" Width="50%"> + <RadioButton Fit="true"/> + <RadioButton Fit="true" IsChecked="true"/> + <RadioButton Fit="true"/> + <RadioButton Fit="true"/> + </VerticalStack> + </HorizontalStack> +</VerticalStack> diff --git a/Tests/Interfaces/Divers/testImage.crow b/Tests/Interfaces/Divers/testImage.crow index eddea8aa..ccdd87c0 100755 --- a/Tests/Interfaces/Divers/testImage.crow +++ b/Tests/Interfaces/Divers/testImage.crow @@ -41,24 +41,24 @@ </HorizontalStack> <HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5"> <Label Text="SCALED PROPORTIONNAL" Width="150"/> - <Image Background="Blue" Path="#Crow.Images.Icons.tetra.png"/> - <Image Margin="10" Background="Blue" Path="#Crow.Images.Icons.tetra.png"/> - <Image Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.tetra.png"/> - <Image Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.tetra.png"/> - <Image Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/> + <Image Background="Blue" Path="#Crow.Icons.tetra.png"/> + <Image Margin="10" Background="Blue" Path="#Crow.Icons.tetra.png"/> + <Image Background="Blue" Width="20" Height="20" Path="#Crow.Icons.tetra.png"/> + <Image Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Icons.tetra.png"/> + <Image Background="Blue" Width="50" Height="100" Path="#Crow.Icons.tetra.png"/> <Image Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/> - <Image Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> - <Image Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> - <Image Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/> - <Image Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/> + <Image Background="Blue" Width="100" Height="50" Path="#Crow.Icons.tetra.png"/> + <Image Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Icons.tetra.png"/> + <Image Background="Blue" Width="50" Height="Fit" Path="#Crow.Icons.tetra.png"/> + <Image Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Crow.Icons.tetra.png"/> </HorizontalStack> <HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5"> <Label Text="SCALED NOT PROPORTIONNAL" Width="150"/> - <Image KeepProportions="false" Background="Blue" Path="#Crow.Images.Icons.tetra.png"/> - <Image KeepProportions="false" Margin="10" Background="Blue" Path="#Crow.Images.Icons.tetra.png"/> - <Image KeepProportions="false" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.tetra.png"/> - <Image KeepProportions="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.tetra.png"/> - <Image KeepProportions="false" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/> + <Image KeepProportions="false" Background="Blue" Path="#Crow.Icons.tetra.png"/> + <Image KeepProportions="false" Margin="10" Background="Blue" Path="#Crow.Icons.tetra.png"/> + <Image KeepProportions="false" Background="Blue" Width="20" Height="20" Path="#Crow.Icons.tetra.png"/> + <Image KeepProportions="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Icons.tetra.png"/> + <Image KeepProportions="false" Background="Blue" Width="50" Height="100" Path="#Crow.Icons.tetra.png"/> <Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/> <Image KeepProportions="false" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> <Image KeepProportions="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> diff --git a/Tests/Interfaces/Divers/testMenu.crow b/Tests/Interfaces/Divers/testMenu.crow new file mode 100755 index 00000000..08822445 --- /dev/null +++ b/Tests/Interfaces/Divers/testMenu.crow @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<Menu> + <MenuItem Caption="File" Width="Fit"> + <MenuItem Command="{CMDTest}"/> + </MenuItem> +</Menu> diff --git a/Tests/Interfaces/Divers/testOutOfClipUpdate.crow b/Tests/Interfaces/Divers/testOutOfClipUpdate.crow index 738f2b11..22523b8c 100755 --- a/Tests/Interfaces/Divers/testOutOfClipUpdate.crow +++ b/Tests/Interfaces/Divers/testOutOfClipUpdate.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Container Width="200" Height="100" Background="DimGray" Margin="5"> +<Container Width="200" Height="100" Background="DimGrey" Margin="5"> <Container Width="Stretched" Height="800" Background="DarkBlue"> <Label Text="{fps}" Background="RoyalBlue" VerticalAlignment="Center"/> </Container> diff --git a/Tests/Interfaces/Divers/testPropLess.crow b/Tests/Interfaces/Divers/testPropLess.crow index 52742477..42282c11 100755 --- a/Tests/Interfaces/Divers/testPropLess.crow +++ b/Tests/Interfaces/Divers/testPropLess.crow @@ -1,2 +1,2 @@ <?xml version="1.0"?> -<Label Margin="50" MinimumSize="10,10" Background="DimGray" Text="{PropertyLessBinding}"/>
\ No newline at end of file +<Label Margin="50" MinimumSize="10,10" Background="DimGrey" Text="{PropertyLessBinding}"/>
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/testShape.crow b/Tests/Interfaces/Divers/testShape.crow index 4adada39..d1f9f3cc 100644 --- a/Tests/Interfaces/Divers/testShape.crow +++ b/Tests/Interfaces/Divers/testShape.crow @@ -1,6 +1,6 @@ <?xml version="1.0"?> <Container Fit="true" Background="Red" Tooltip="test tooltip" > - <Shape Foreground="Transparent" Background="DimGray" Path="M 5.5,0.5 L 10.5,10.5 L 0.5,10.5 Z" - MouseEnter="{Background=hgradient|0:DimGray|0.5:RoyalBlue|1:Black}" - MouseLeave="{Background=DimGray}"/> + <Shape Foreground="Transparent" Background="DimGrey" Path="M 5.5,0.5 L 10.5,10.5 L 0.5,10.5 Z" + MouseEnter="{Background=hgradient|0:DimGrey|0.5:RoyalBlue|1:Black}" + MouseLeave="{Background=DimGrey}"/> </Container>
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/testStacks.crow b/Tests/Interfaces/Divers/testStacks.crow index ac2cccc6..99279cd4 100755 --- a/Tests/Interfaces/Divers/testStacks.crow +++ b/Tests/Interfaces/Divers/testStacks.crow @@ -1,82 +1,82 @@ <?xml version="1.0"?> <Window Width="500" Height="300" MinimumSize="50,50"> -<HorizontalStack Margin="5" Background="DimGray"> - <VerticalStack Width="200" Margin="5" Background="Gray"> - <VerticalStack Fit="true" Background="DimGray" Margin="5"> +<HorizontalStack Margin="5" Background="DimGrey"> + <VerticalStack Width="200" Margin="5" Background="Grey"> + <VerticalStack Fit="true" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </VerticalStack> - <VerticalStack Width="Stretched" Height="Fit" Background="DimGray" Margin="5"> + <VerticalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue" Width="Stretched"/> <TextRun Background="SkyBlue" Height="Stretched"/> </VerticalStack> - <HorizontalStack Fit="true" Background="DimGray" Margin="5"> + <HorizontalStack Fit="true" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="Stretched" Height="Fit" Background="DimGray" Margin="5"> + <HorizontalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="Stretched" Height="Stretched" Background="DimGray" Margin="5"> + <HorizontalStack Width="Stretched" Height="Stretched" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue" Width="Stretched"/> <TextRun Background="SkyBlue"/> </HorizontalStack> </VerticalStack> - <VerticalStack Width="Stretched" Height="Stretched" Margin="5" Background="Gray"> - <VerticalStack Fit="true" Background="DimGray" Margin="5"> + <VerticalStack Width="Stretched" Height="Stretched" Margin="5" Background="Grey"> + <VerticalStack Fit="true" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </VerticalStack> - <VerticalStack Width="Stretched" Height="Stretched" Background="DimGray" Margin="5"> + <VerticalStack Width="Stretched" Height="Stretched" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue" Width="Stretched"/> <TextRun TextAlignment="Center" Background="SkyBlue" Width="Stretched" Height="Stretched"/> </VerticalStack> - <HorizontalStack Fit="true" Background="DimGray" Margin="5"> + <HorizontalStack Fit="true" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="Stretched" Height="Fit" Background="DimGray" Margin="5"> + <HorizontalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="Stretched" Height="Fit" Background="DimGray" Margin="5"> + <HorizontalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue" Width="Stretched"/> <TextRun Background="SkyBlue"/> </HorizontalStack> </VerticalStack> - <VerticalStack Width="Fit" Margin="5" Background="Gray"> - <VerticalStack Width="Stretched" Height="Fit" Background="DimGray" Margin="5"> + <VerticalStack Width="Fit" Margin="5" Background="Grey"> + <VerticalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue" HorizontalAlignment="Left"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </VerticalStack> - <VerticalStack Width="Stretched" Height="Fit" Background="DimGray" Margin="5"> + <VerticalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue" Width="Stretched"/> <TextRun Background="SkyBlue" Height="Stretched"/> </VerticalStack> - <HorizontalStack Fit="true" Background="DimGray" Margin="5"> + <HorizontalStack Fit="true" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="Stretched" Height="Fit" Background="DimGray" Margin="5"> + <HorizontalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="Stretched" Height="Stretched" Background="DimGray" Margin="5"> + <HorizontalStack Width="Stretched" Height="Stretched" Background="DimGrey" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue" Width="Stretched"/> <TextRun Background="SkyBlue"/> diff --git a/Tests/Interfaces/Divers/testTextBox.crow b/Tests/Interfaces/Divers/testTextBox.crow index 8a98ff84..d0fe0af4 100755 --- a/Tests/Interfaces/Divers/testTextBox.crow +++ b/Tests/Interfaces/Divers/testTextBox.crow @@ -1,24 +1,24 @@ <?xml version="1.0"?> <VerticalStack Background="SteelBlue" Fit="true"> <HorizontalStack Fit="true"> - <TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="TopLeft"/> - <TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Top"/> - <TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="TopRight"/> - <TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Left"/> - <TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Center"/> - <TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Right"/> - <TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="BottomLeft"/> - <TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Bottom"/> - <TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="BottomRight"/> + <TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="TopLeft"/> + <TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Top"/> + <TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="TopRight"/> + <TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Left"/> + <TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Center"/> + <TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Right"/> + <TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="BottomLeft"/> + <TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Bottom"/> + <TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="BottomRight"/> </HorizontalStack> <HorizontalStack Fit="true"> - <TextBox Background="DarkGray" Height="30" Width="70" TextAlignment="Top" HorizontalStretch="true" Text="TopStretch"/> - <TextBox Background="DarkGray" Height="30" Width="60" TextAlignment="Center" HorizontalStretch="true" Text="HorizontalStretch" /> - <TextBox Background="DarkGray" Height="30" Width="60" TextAlignment="Bottom" HorizontalStretch="true" Text="BottomStretch"/> - <TextBox Background="DarkGray" Height="10" Width="70" TextAlignment="Left" VerticalStretch="true" Text="LeftStretch"/> - <TextBox Background="DarkGray" Height="10" Width="70" TextAlignment="Center" VerticalStretch="true" Text="VerticalStretch"/> - <TextBox Background="DarkGray" Height="10" Width="70" TextAlignment="Right" VerticalStretch="true" Text="RightStretch"/> - <TextBox Background="DarkGray" Height="30" Width="50" HorizontalStretch="true" VerticalStretch="true" Text="Fit"/> + <TextBox Background="DarkGrey" Height="30" Width="70" TextAlignment="Top" HorizontalStretch="true" Text="TopStretch"/> + <TextBox Background="DarkGrey" Height="30" Width="60" TextAlignment="Center" HorizontalStretch="true" Text="HorizontalStretch" /> + <TextBox Background="DarkGrey" Height="30" Width="60" TextAlignment="Bottom" HorizontalStretch="true" Text="BottomStretch"/> + <TextBox Background="DarkGrey" Height="10" Width="70" TextAlignment="Left" VerticalStretch="true" Text="LeftStretch"/> + <TextBox Background="DarkGrey" Height="10" Width="70" TextAlignment="Center" VerticalStretch="true" Text="VerticalStretch"/> + <TextBox Background="DarkGrey" Height="10" Width="70" TextAlignment="Right" VerticalStretch="true" Text="RightStretch"/> + <TextBox Background="DarkGrey" Height="30" Width="50" HorizontalStretch="true" VerticalStretch="true" Text="Fit"/> </HorizontalStack> <TextBox Name="tb" Multiline="true" Font="droid,16" Margin="5" Text="A\nBB\nCCC\nDDDD"/> <TextBox Multiline="true" Font="droid,16" Name="tb5" Margin="5" Text="{../tb.SelectedText}"/> diff --git a/Tests/Interfaces/Divers/testVisibility.crow b/Tests/Interfaces/Divers/testVisibility.crow new file mode 100755 index 00000000..70abcbdb --- /dev/null +++ b/Tests/Interfaces/Divers/testVisibility.crow @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<Container Margin="20" Background="Red" > + <Container Margin="20" Background="Green" MouseDown="{../go1.Visible=True}" > + <GraphicObject Name="go1" Margin="20" Background="DimGrey" Visible="false" MouseDown="{Visible=false}" + MouseEnter="{Background=Blue}" + MouseLeave="{Background=DimGrey}"/> + </Container> +</Container> diff --git a/Tests/Interfaces/Divers/welcome.crow b/Tests/Interfaces/Divers/welcome.crow index 22dfd749..fb251487 100644 --- a/Tests/Interfaces/Divers/welcome.crow +++ b/Tests/Interfaces/Divers/welcome.crow @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Border BorderStyle="Sunken" Fit="true" Background="0.7,0.7,0.7,0.5" CornerRadius="10"> <VerticalStack Margin="20"> - <Image Path="#Crow.Images.Icons.crow.svg"/> + <Image Path="#Crow.Icons.crow.svg"/> <!-- <Label Font="Times bold, 60" Text="C.R.O.W"/>--> <HorizontalStack Fit="true" DataSource="{CrowVersion}" Spacing="0"> <Label Foreground="Black" Font="mono, 12" Text="version: "/> @@ -9,13 +9,13 @@ <Label Foreground="Black" Font="mono, 12" Text="."/> <Label Foreground="Black" Font="mono, 12" Text="{Minor}"/> <Label Foreground="Black" Font="mono, 12" Text="."/> - <Label Foreground="DimGray" Font="mono, 12" Text="{Build}"/> + <Label Foreground="DimGrey" Font="mono, 12" Text="{Build}"/> </HorizontalStack> <GraphicObject Height="30"/> <Label Font="20" Text="Press <F2> and <F3> to cycle into the examples"/> <Label Font="20" Text="Those are basic tests used to validate changes,"/> <GraphicObject Height="30"/> - <Label Foreground="DimGray" Font="20" Text="<F5> => File dialog example"/> - <Label Foreground="DimGray" Font="20" Text="<F6> => Window example"/> + <Label Foreground="DimGrey" Font="20" Text="<F5> => File dialog example"/> + <Label Foreground="DimGrey" Font="20" Text="<F6> => Window example"/> </VerticalStack> </Border>
\ No newline at end of file diff --git a/Tests/Interfaces/DragAndDrop/0.crow b/Tests/Interfaces/DragAndDrop/0.crow index 356fa49a..ca1a7bb5 100755 --- a/Tests/Interfaces/DragAndDrop/0.crow +++ b/Tests/Interfaces/DragAndDrop/0.crow @@ -1,20 +1,20 @@ <?xml version="1.0"?> -<HorizontalStack Background="DimGray" Margin="10" Width="90%" Height="90%" Spacing="100" Focusable="true"> - <Container Name="source" StartDrag="{Background=DimGray}" EndDrag="{Background=SeaGreen}" Focusable="true" Fit="true" +<HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="90%" Spacing="100" Focusable="true"> + <Container Name="source" StartDrag="{Background=DimGrey}" EndDrag="{Background=SeaGreen}" Focusable="true" Fit="true" Drop="{../target.Background=Green}" MouseEnter="{/txt.Foreground=Red}" MouseLeave="{/txt.Foreground=White}" MouseClick="{Background=SeaGreen}" AllowDrag="true" Width="200" Height="200" Background="SeaGreen"> <VerticalStack Margin="50"> - <Label Name="txt" Text="Drag me" Foreground="Gray"/> - <Label Text="Dragged" Visible="{../../IsDragged}" Foreground="Gray"/> + <Label Name="txt" Text="Drag me" Foreground="Grey"/> + <Label Text="Dragged" Visible="{../../IsDragged}" Foreground="Grey"/> </VerticalStack> </Container> - <Container Name="target" DragEnter="{Background=SeaGreen}" DragLeave="{Background=DimGray}" Focusable="true" Fit="true" + <Container Name="target" DragEnter="{Background=SeaGreen}" DragLeave="{Background=DimGrey}" Focusable="true" Fit="true" MouseEnter="{/txt.Foreground=Red}" MouseLeave="{/txt.Foreground=White}" - AllowDrop="true" Background="DimGray"> + AllowDrop="true" Background="DimGrey"> <VerticalStack Margin="50"> - <Label Name="txt" Text="Drop here" Foreground="Gray"/> - <Label Text="Dragged" Visible="{../../IsDragged}" Foreground="Gray"/> + <Label Name="txt" Text="Drop here" Foreground="Grey"/> + <Label Text="Dragged" Visible="{../../IsDragged}" Foreground="Grey"/> </VerticalStack> </Container> </HorizontalStack>
\ No newline at end of file diff --git a/Tests/Interfaces/Experimental/DockWindow.template b/Tests/Interfaces/Experimental/DockWindow.template new file mode 100755 index 00000000..42f51163 --- /dev/null +++ b/Tests/Interfaces/Experimental/DockWindow.template @@ -0,0 +1,39 @@ +<?xml version="1.0"?> +<!--<GraphicObject Background="{./Background}"/>--> +<Border BorderWidth="1" Foreground="Black" CornerRadius="{./CornerRadius}" + Background="{./Background}" + MouseEnter="./onBorderMouseEnter" + MouseLeave="./onBorderMouseLeave"> + <VerticalStack Spacing="0"> + <HorizontalStack Height="Fit"> + <Label Text="{./Name}" TextAlignment="Left" Width="Fit" + Foreground="White" /> + <Label Text="{./DockingPosition}" TextAlignment="Left" Width="Fit" + Foreground="White" /> + </HorizontalStack> + <Label Text="{./Width}" TextAlignment="Left" Width="Fit" + Foreground="White" /> + <Label Text="{./Height}" TextAlignment="Left" Width="Fit" + Foreground="White" /> + + <HorizontalStack Visible="{./IsDocked}" Height="Fit" Margin="1" Background="Grey"> + <Label Text="{./Caption}" TextAlignment="Left" Width="Stretched" + Foreground="Jet" /> + <Image Width="8" Height="8" Focusable="true" Margin="0" Path="#Crow.Icons.exit2.svg" + MouseClick="./butQuitPress"/> + </HorizontalStack> + <HorizontalStack Background="vgradient|0:0.5,0.6,0.5,0.5|1:0.2,0.3,0.3,0.7" + Name="hs" Margin="0" Spacing="0" Height="Fit" Visible="{./IsFloating}"> + <GraphicObject Width="5"/> + <Image Margin="1" Width="10" Height="10" Path="{./Icon}"/> + <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Left" Text="{./Caption}" /> + <Border CornerRadius="6" BorderWidth="1" Foreground="Transparent" Height="10" Width="10" + MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}"> + <Image Focusable="true" Name="Image" Margin="0" Path="#Crow.Icons.exit2.svg" + MouseClick="./butQuitPress"/> + </Border> + <GraphicObject Width="5"/> + </HorizontalStack> + <Container Name="Content" MinimumSize="50,50"/> + </VerticalStack> +</Border> diff --git a/Tests/Interfaces/Experimental/testDock.crow b/Tests/Interfaces/Experimental/testDock.crow index 94a936a6..c0e6e96b 100644 --- a/Tests/Interfaces/Experimental/testDock.crow +++ b/Tests/Interfaces/Experimental/testDock.crow @@ -1,16 +1,17 @@ <?xml version="1.0"?> -<Window Height="50%" Width="60%"> - <DockStack Background="#60101050" Margin="10"/> +<Window Width="Stretched" Height="Stretched" Background="Jet"> + <DockStack Name="mainDock" Background="DarkRed" Margin="20"> + </DockStack> </Window> -<!--- <DockWindow Left="400" Top="400" Width="150" Height="150" Background="MediumSeaGreen"/> +<!--- <DockWindow Left="450" Top="450" Width="150" Height="150" Background="Maize"/>--> -<!--<Group Background="DimGray" Margin = "0" Focusable="true" > - <Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><GraphicObject Background="Green" Focusable="true" MouseEnter="{Background=Gray}" MouseLeave="{Background=Green}"/></Window> - <Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Gray}" MouseLeave="{Background=Blue}"/></Window> - <Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Gray}" MouseLeave="{Background=Yellow}"/></Window> - <Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Gray}" MouseLeave="{Background=Black}"/></Window> +<!--<Group Background="DimGrey" Margin = "0" Focusable="true" > + <Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><GraphicObject Background="Green" Focusable="true" MouseEnter="{Background=Grey}" MouseLeave="{Background=Green}"/></Window> + <Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></Window> + <Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></Window> + <Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></Window> </Group>--> <!--<Docker > <DockWindow Resizable = "true" Top="100" Left="100" Caption="View 1" Width="300" Height="300"> @@ -20,7 +21,7 @@ <Label Text="{../../LogicalParent}" Background="Black"/> </VerticalStack> </DockWindow> - <DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Gray}" MouseLeave="{Background=Blue}"/></DockWindow> - <DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Gray}" MouseLeave="{Background=Yellow}"/></DockWindow> - <DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Gray}" MouseLeave="{Background=Black}"/></DockWindow> + <DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></DockWindow> + <DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></DockWindow> + <DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></DockWindow> </Docker>-->
\ No newline at end of file diff --git a/Tests/Interfaces/Experimental/testDock2.crow b/Tests/Interfaces/Experimental/testDock2.crow index 700f965c..041d0d85 100644 --- a/Tests/Interfaces/Experimental/testDock2.crow +++ b/Tests/Interfaces/Experimental/testDock2.crow @@ -6,11 +6,11 @@ <DockWindow Left="400" Top="400" Width="150" Height="150" Background="DarkYellow"/> <DockWindow Left="500" Top="500" Width="150" Height="150" Background="Yellow"/> </Docker> -<!--<Group Background="DimGray" Margin = "0" Focusable="true" > - <Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><GraphicObject Background="Green" Focusable="true" MouseEnter="{Background=Gray}" MouseLeave="{Background=Green}"/></Window> - <Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Gray}" MouseLeave="{Background=Blue}"/></Window> - <Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Gray}" MouseLeave="{Background=Yellow}"/></Window> - <Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Gray}" MouseLeave="{Background=Black}"/></Window> +<!--<Group Background="DimGrey" Margin = "0" Focusable="true" > + <Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><GraphicObject Background="Green" Focusable="true" MouseEnter="{Background=Grey}" MouseLeave="{Background=Green}"/></Window> + <Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></Window> + <Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></Window> + <Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></Window> </Group>--> <!--<Docker > <DockWindow Resizable = "true" Top="100" Left="100" Caption="View 1" Width="300" Height="300"> @@ -20,7 +20,7 @@ <Label Text="{../../LogicalParent}" Background="Black"/> </VerticalStack> </DockWindow> - <DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Gray}" MouseLeave="{Background=Blue}"/></DockWindow> - <DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Gray}" MouseLeave="{Background=Yellow}"/></DockWindow> - <DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Gray}" MouseLeave="{Background=Black}"/></DockWindow> + <DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></DockWindow> + <DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></DockWindow> + <DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></DockWindow> </Docker>-->
\ No newline at end of file diff --git a/Tests/Interfaces/Experimental/testStack.crow b/Tests/Interfaces/Experimental/testStack.crow index 88e309dc..e17db3b1 100644 --- a/Tests/Interfaces/Experimental/testStack.crow +++ b/Tests/Interfaces/Experimental/testStack.crow @@ -1,6 +1,6 @@ <?xml version="1.0"?> <Window Width="600" Height="500"> -<VerticalStack Margin="20" Background="DimGray" Spacing="10"> +<VerticalStack Margin="20" Background="DimGrey" Spacing="10"> <GraphicObject Height="100" Width="500" Background="Green"/> <Splitter/> <HorizontalStack> @@ -12,11 +12,11 @@ <GraphicObject Height="100" Width="500" Background="Green"/> </VerticalStack> </Window> -<!--<Group Background="DimGray" Margin = "0" Focusable="true" > - <Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><GraphicObject Background="Green" Focusable="true" MouseEnter="{Background=Gray}" MouseLeave="{Background=Green}"/></Window> - <Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Gray}" MouseLeave="{Background=Blue}"/></Window> - <Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Gray}" MouseLeave="{Background=Yellow}"/></Window> - <Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Gray}" MouseLeave="{Background=Black}"/></Window> +<!--<Group Background="DimGrey" Margin = "0" Focusable="true" > + <Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><GraphicObject Background="Green" Focusable="true" MouseEnter="{Background=Grey}" MouseLeave="{Background=Green}"/></Window> + <Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></Window> + <Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></Window> + <Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></Window> </Group>--> <!--<Docker > <DockWindow Resizable = "true" Top="100" Left="100" Caption="View 1" Width="300" Height="300"> @@ -26,7 +26,7 @@ <Label Text="{../../LogicalParent}" Background="Black"/> </VerticalStack> </DockWindow> - <DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Gray}" MouseLeave="{Background=Blue}"/></DockWindow> - <DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Gray}" MouseLeave="{Background=Yellow}"/></DockWindow> - <DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Gray}" MouseLeave="{Background=Black}"/></DockWindow> + <DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></DockWindow> + <DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></DockWindow> + <DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></DockWindow> </Docker>-->
\ No newline at end of file diff --git a/Tests/Interfaces/GraphicObject/0.crow b/Tests/Interfaces/GraphicObject/0.crow index 7fdd607f..97cda8a0 100755 --- a/Tests/Interfaces/GraphicObject/0.crow +++ b/Tests/Interfaces/GraphicObject/0.crow @@ -1,3 +1,2 @@ <?xml version="1.0"?> -<GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="SeaGreen" - MinimumSize="50,50"/>
\ No newline at end of file +<GraphicObject Background="SeaGreen"/>
\ No newline at end of file diff --git a/Tests/Interfaces/Group/0.crow b/Tests/Interfaces/Group/0.crow index 9195ed4f..836231de 100755 --- a/Tests/Interfaces/Group/0.crow +++ b/Tests/Interfaces/Group/0.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Group MinimumSize="50,50" Background="DimGray" Margin="10" Width="90%" Height="90%"> +<Group MinimumSize="50,50" Background="DimGrey" Margin="10" Width="90%" Height="90%"> <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen" VerticalAlignment="Top" MinimumSize="10,10"/> diff --git a/Tests/Interfaces/Group/1.crow b/Tests/Interfaces/Group/1.crow index 4f355f9b..540d4192 100755 --- a/Tests/Interfaces/Group/1.crow +++ b/Tests/Interfaces/Group/1.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Group Background="DimGray" Margin="10" Width="90%" Height="90%"> +<Group Background="DimGrey" Margin="10" Width="90%" Height="90%"> <GraphicObject Margin="10" Width="20%" Height="20%" Background="SeaGreen" VerticalAlignment="Top" HorizontalAlignment="Left" diff --git a/Tests/Interfaces/Group/2.crow b/Tests/Interfaces/Group/2.crow index de743d3a..6982fc2b 100755 --- a/Tests/Interfaces/Group/2.crow +++ b/Tests/Interfaces/Group/2.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Group Background="DimGray" Margin="10" Fit="true"> +<Group Background="DimGrey" Margin="10" Fit="true"> <GraphicObject Margin="10" Width="20%" Height="20%" Background="SeaGreen" VerticalAlignment="Top" HorizontalAlignment="Left" diff --git a/Tests/Interfaces/Group/3.crow b/Tests/Interfaces/Group/3.crow index e323fd08..b6482063 100755 --- a/Tests/Interfaces/Group/3.crow +++ b/Tests/Interfaces/Group/3.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Group Background="DimGray" Margin="10" Width="70%" Height="50%"> +<Group Background="DimGrey" Margin="10" Width="70%" Height="50%"> <GraphicObject Margin="10" Width="20%" Height="20%" Background="SeaGreen" VerticalAlignment="Top" HorizontalAlignment="Left" diff --git a/Tests/Interfaces/Group/4.crow b/Tests/Interfaces/Group/4.crow index b7704d5b..815ef495 100755 --- a/Tests/Interfaces/Group/4.crow +++ b/Tests/Interfaces/Group/4.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Group Background="DimGray" Margin="10" Fit="true"> +<Group Background="DimGrey" Margin="10" Fit="true"> <Label Font="droid bold,40" Text="{fps}" Margin="10" Fit="true"/> <GraphicObject Margin="10" Width="20%" Height="20%" Background="SeaGreen" VerticalAlignment="Top" diff --git a/Tests/Interfaces/Splitter/1.crow b/Tests/Interfaces/Splitter/1.crow index e7eef87b..48c1ea1e 100755 --- a/Tests/Interfaces/Splitter/1.crow +++ b/Tests/Interfaces/Splitter/1.crow @@ -19,7 +19,7 @@ </Border> <Splitter Thickness="3"/> <Border Width="45%" CornerRadius="10" BorderWidth="1"> - <VerticalStack Width="50%" Height="50%" Background="DimGray"> + <VerticalStack Width="50%" Height="50%" Background="DimGrey"> <RadioButton IsChecked="false" Caption="Choice 1" Background="hgradient|0:DarkRed|1:Transparent"/> <RadioButton IsChecked="false" Caption="Choice 2" Background="hgradient|0:DarkRed|1:Transparent"/> <RadioButton IsChecked="true" Caption="Choice 3" Background="hgradient|0:DarkRed|1:Transparent"/> diff --git a/Tests/Interfaces/Stack/0.crow b/Tests/Interfaces/Stack/0.crow index 467a063e..1cdc4981 100755 --- a/Tests/Interfaces/Stack/0.crow +++ b/Tests/Interfaces/Stack/0.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<VerticalStack MinimumSize="50,50" Background="DimGray" Margin="10" Width="90%" Height="90%"> +<VerticalStack MinimumSize="50,50" Background="DimGrey" Margin="10" Width="90%" Height="90%"> <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen" MinimumSize="10,10"/> <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen" diff --git a/Tests/Interfaces/Stack/0h.crow b/Tests/Interfaces/Stack/0h.crow index 95ef1359..24ee8a49 100755 --- a/Tests/Interfaces/Stack/0h.crow +++ b/Tests/Interfaces/Stack/0h.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<HorizontalStack MinimumSize="50,50" Background="DimGray" Margin="10" Width="90%" Height="90%"> +<HorizontalStack MinimumSize="50,50" Background="DimGrey" Margin="10" Width="90%" Height="90%"> <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen" MinimumSize="10,10"/> <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen" diff --git a/Tests/Interfaces/Stack/1.crow b/Tests/Interfaces/Stack/1.crow index 8a6a3c3c..d0e0c350 100755 --- a/Tests/Interfaces/Stack/1.crow +++ b/Tests/Interfaces/Stack/1.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<VerticalStack Background="DimGray" Margin="10" Width="90%" Height="90%"> +<VerticalStack Background="DimGrey" Margin="10" Width="90%" Height="90%"> <GraphicObject Margin="10" Width="Stretched" Height="20%" Background="SeaGreen" MinimumSize="10,10"/> <GraphicObject Margin="10" Width="Stretched" Height="60%" Background="SeaGreen" diff --git a/Tests/Interfaces/Stack/1h.crow b/Tests/Interfaces/Stack/1h.crow index c8ea266d..b4cb18d2 100755 --- a/Tests/Interfaces/Stack/1h.crow +++ b/Tests/Interfaces/Stack/1h.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<HorizontalStack Background="DimGray" Margin="10" Width="90%" Height="90%"> +<HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="90%"> <GraphicObject Margin="10" Width="Stretched" Height="20%" Background="SeaGreen" MinimumSize="10,10"/> <GraphicObject Margin="10" Width="Stretched" Height="60%" Background="SeaGreen" diff --git a/Tests/Interfaces/Stack/2.crow b/Tests/Interfaces/Stack/2.crow index a3f2c019..64006cce 100755 --- a/Tests/Interfaces/Stack/2.crow +++ b/Tests/Interfaces/Stack/2.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<VerticalStack Background="DimGray" Margin="10" Width="90%" Height="100%"> +<VerticalStack Background="DimGrey" Margin="10" Width="90%" Height="100%"> <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen" MinimumSize="10,10"/> <GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="SeaGreen" diff --git a/Tests/Interfaces/Stack/2h.crow b/Tests/Interfaces/Stack/2h.crow index faa5956c..3bb7d5f0 100755 --- a/Tests/Interfaces/Stack/2h.crow +++ b/Tests/Interfaces/Stack/2h.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<HorizontalStack Background="DimGray" Margin="10" Width="90%" Height="100%"> +<HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="100%"> <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen" MinimumSize="10,10"/> <GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="SeaGreen" diff --git a/Tests/Interfaces/Stack/3.crow b/Tests/Interfaces/Stack/3.crow index b7784b90..b7d3543a 100755 --- a/Tests/Interfaces/Stack/3.crow +++ b/Tests/Interfaces/Stack/3.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<VerticalStack Background="DimGray" Margin="10" Width="90%" Height="90%"> +<VerticalStack Background="DimGrey" Margin="10" Width="90%" Height="90%"> <GraphicObject Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen" MinimumSize="2,2"/> <GraphicObject Margin="1" Width="Stretched" Height="Stretched" Background="SeaGreen" diff --git a/Tests/Interfaces/Stack/3h.crow b/Tests/Interfaces/Stack/3h.crow index 620cdeee..a20a284b 100755 --- a/Tests/Interfaces/Stack/3h.crow +++ b/Tests/Interfaces/Stack/3h.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<HorizontalStack Background="DimGray" Margin="10" Width="90%" Height="90%"> +<HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="90%"> <GraphicObject Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen" MinimumSize="2,2"/> <GraphicObject Margin="1" Width="Stretched" Height="Stretched" Background="SeaGreen" diff --git a/Tests/Interfaces/Stack/4.crow b/Tests/Interfaces/Stack/4.crow index 6a7f2da7..33d57deb 100755 --- a/Tests/Interfaces/Stack/4.crow +++ b/Tests/Interfaces/Stack/4.crow @@ -1,6 +1,6 @@ <?xml version="1.0"?> <VerticalStack> - <HorizontalStack Background="DimGray" Margin="10" Width="90%" Height="20%"> + <HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="20%"> <Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/> <Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/> <Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/> @@ -12,7 +12,7 @@ <Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/> <Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/> </HorizontalStack> - <HorizontalStack Background="DimGray" Margin="10" Width="Fit" Height="20%"> + <HorizontalStack Background="DimGrey" Margin="10" Width="Fit" Height="20%"> <Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/> <Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/> <Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/> diff --git a/Tests/Interfaces/TabItem.template b/Tests/Interfaces/TabItem.template index df580a85..fd0f310d 100644 --- a/Tests/Interfaces/TabItem.template +++ b/Tests/Interfaces/TabItem.template @@ -2,23 +2,23 @@ <GenericStack Orientation="Vertical" Spacing="0" Background="{./Background}" MouseEnter="{/caption.Foreground=White}" - MouseLeave="{/caption.Foreground=Gray}"> + MouseLeave="{/caption.Foreground=Grey}"> <HorizontalStack Left="{./TabOffset}" Name="TabTitle" HorizontalAlignment="Left" Height="{./TabHeight}" Width="{./TabWidth}"> - <Label Name="caption" Text="{./Caption}" Foreground="Gray" Width="Stretched"/> + <Label Name="caption" Text="{./Caption}" Foreground="Grey" Width="Stretched"/> <Label Text="{./ViewIndex}" Foreground="Green"/> <Label Text="{./TabOffset}" Foreground="Red"/> <Border CornerRadius="5" BorderWidth="1" Foreground="Transparent" Height="12" Width="12" MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}"> - <Image Focusable="true" Name="Image" Margin="0" Width="Stretched" Height="Stretched" Path="#Crow.Images.Icons.exit2.svg" + <Image Focusable="true" Name="Image" Margin="0" Width="Stretched" Height="Stretched" Path="#Crow.Icons.exit2.svg" MouseClick="./butCloseTabClick"/> </Border> </HorizontalStack> <Container Margin="20"> - <Container Background="DimGray" Name="Content"/> + <Container Background="DimGrey" Name="Content"/> </Container> </GenericStack> diff --git a/Tests/Interfaces/TemplatedContainer/0.crow b/Tests/Interfaces/TemplatedContainer/0.crow index e600d37c..5b267402 100755 --- a/Tests/Interfaces/TemplatedContainer/0.crow +++ b/Tests/Interfaces/TemplatedContainer/0.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<Expandable Fit="true" Caption="Test expandable" Background="DimGray"> +<Expandable Fit="true" Caption="Test expandable" Background="DimGrey"> <VerticalStack Margin="5" > <CheckBox Name="chk1" /> <CheckBox Name="chk2" IsChecked="true"/> diff --git a/Tests/Interfaces/TemplatedContainer/6.crow b/Tests/Interfaces/TemplatedContainer/6.crow index c1362017..641d58f9 100755 --- a/Tests/Interfaces/TemplatedContainer/6.crow +++ b/Tests/Interfaces/TemplatedContainer/6.crow @@ -1,8 +1,8 @@ -<Expandable Width="Stretched" Background="Gray"> +<Expandable Width="Stretched" Background="Grey"> <Expandable Width="Stretched" Background="LightBlue"> <Expandable Width="Stretched" Background="Green"> <Expandable Width="Stretched" Background="LimeGreen"> - <Expandable Width="Stretched" Background="DimGray"> + <Expandable Width="Stretched" Background="DimGrey"> <Expandable Width="Stretched" Background="Yellow"> <Expandable Width="Stretched" Background="SeaGreen"> <Expandable Width="Stretched" Background="Blue"> diff --git a/Tests/Interfaces/TemplatedContainer/7.crow b/Tests/Interfaces/TemplatedContainer/7.crow index 648b7a82..99a75079 100755 --- a/Tests/Interfaces/TemplatedContainer/7.crow +++ b/Tests/Interfaces/TemplatedContainer/7.crow @@ -1,11 +1,11 @@ <?xml version="1.0"?> <VerticalStack Height="Fit" Width="Fit"> <Label Width="Stretched"/> - <Expandable Width="Fit" Background="Gray"> + <Expandable Width="Fit" Background="Grey"> <Expandable Background="LightBlue"> <Expandable Background="Green"> <Expandable Background="LimeGreen"> - <Expandable Background="DimGray"> + <Expandable Background="DimGrey"> <Expandable Width="Stretched" Background="Yellow"> <Expandable Background="SeaGreen"> <Expandable Width="Stretched" Background="Blue"> diff --git a/Tests/Interfaces/TemplatedContainer/testGroupBox.crow b/Tests/Interfaces/TemplatedContainer/testGroupBox.crow index 416bb217..48581803 100755 --- a/Tests/Interfaces/TemplatedContainer/testGroupBox.crow +++ b/Tests/Interfaces/TemplatedContainer/testGroupBox.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!--<Container Background="vgradient|0:DarkGray|1:DimGray">--> +<!--<Container Background="vgradient|0:DarkGrey|1:DimGrey">--> <GroupBox Fit="true" Background="vgradient|0:SteelBlue|1:Transparent" Foreground="White"> <!-- <Label/>--> diff --git a/Tests/Interfaces/TemplatedContainer/testPopper.crow b/Tests/Interfaces/TemplatedContainer/testPopper.crow index 07e56b80..7d70da96 100755 --- a/Tests/Interfaces/TemplatedContainer/testPopper.crow +++ b/Tests/Interfaces/TemplatedContainer/testPopper.crow @@ -9,7 +9,7 @@ </VerticalStack> </Border> <GraphicObject Height="200"/> - <Popper Caption="TestPopper" Width="100" Background="DimGray" PopDirection="{alignment}"> + <Popper Caption="TestPopper" Width="100" Background="DimGrey" PopDirection="{alignment}"> <Border Fit="True" Background="SteelBlue"> <Image Fit="true" Path="#go.Images.Icons.tetra.png" Margin="10"/> <VerticalStack Fit="true" Margin="10" Background="CornflowerBlue"> diff --git a/Tests/Interfaces/TemplatedContainer/testTabView.crow b/Tests/Interfaces/TemplatedContainer/testTabView.crow index c9e211f8..e3717c82 100644 --- a/Tests/Interfaces/TemplatedContainer/testTabView.crow +++ b/Tests/Interfaces/TemplatedContainer/testTabView.crow @@ -5,8 +5,8 @@ <Label Text="Selected Tab:"/> <Label Text="{../../tabview1.SelectedTab}"/> </HorizontalStack> - <TabView Name="tabview1" Background="DimGray" Orientation="Horizontal"> - <TabItem Name="TabItem1" Caption="tab item 1" Background="DimGray"> + <TabView Name="tabview1" Background="DimGrey" Orientation="Horizontal"> + <TabItem Name="TabItem1" Caption="tab item 1" Background="DimGrey"> <VerticalStack Margin="20"> <CheckBox/> <CheckBox/> @@ -14,7 +14,7 @@ <CheckBox/> </VerticalStack> </TabItem> - <TabItem Name="TabItem2" Caption="tab item 2" Background="DimGray"> + <TabItem Name="TabItem2" Caption="tab item 2" Background="DimGrey"> <VerticalStack Height="Fit" Margin="10"> <RadioButton Fit="true"/> <RadioButton/> @@ -22,16 +22,16 @@ <RadioButton/> </VerticalStack> </TabItem> - <TabItem Name="TabItem3" Background="DimGray" Caption="tab item 3"> + <TabItem Name="TabItem3" Background="DimGrey" Caption="tab item 3"> <Container Margin="5" CornerRadius="2" > <TextBox Margin="5" Multiline="true" TextAlignment="TopLeft"/> </Container> </TabItem> - <TabItem Name="TabItem4" Background="DimGray" Caption="tab item 4" Margin="0"> + <TabItem Name="TabItem4" Background="DimGrey" Caption="tab item 4" Margin="0"> <TextBox/> </TabItem> </TabView> - <Button Background="vgradient|0:DimGray|1:Black" HorizontalAlignment="Right" + <Button Background="vgradient|0:DimGrey|1:Black" HorizontalAlignment="Right" Caption="Add new tab" Width="Fit" Height="30" MouseDown="onAddTabButClick"/> </VerticalStack> </Group>
\ No newline at end of file diff --git a/Tests/Interfaces/TemplatedContainer/testTabView2.crow b/Tests/Interfaces/TemplatedContainer/testTabView2.crow index c02e991a..67b87b07 100644 --- a/Tests/Interfaces/TemplatedContainer/testTabView2.crow +++ b/Tests/Interfaces/TemplatedContainer/testTabView2.crow @@ -5,8 +5,8 @@ <Label Text="Selected Tab:"/> <Label Text="{../../tabview1.SelectedTab}"/> </HorizontalStack> - <TabView Name="tabview1" Background="DimGray" Orientation="Horizontal" Margin="5" > - <TabItem Name="TabItem1" Caption="tab-1.1" Background="DimGray"> + <TabView Name="tabview1" Background="DimGrey" Orientation="Horizontal" Margin="5" > + <TabItem Name="TabItem1" Caption="tab-1.1" Background="DimGrey"> <VerticalStack Margin="20"> <CheckBox/> <CheckBox/> @@ -14,7 +14,7 @@ <CheckBox/> </VerticalStack> </TabItem> - <TabItem Name="TabItem2" Caption="tab-1.2" Background="DimGray"> + <TabItem Name="TabItem2" Caption="tab-1.2" Background="DimGrey"> <VerticalStack Height="Fit" Margin="10"> <RadioButton Fit="true"/> <RadioButton/> @@ -22,13 +22,13 @@ <RadioButton/> </VerticalStack> </TabItem> - <TabItem Name="TabItem3" Background="DimGray" Caption="tab-1.3"> + <TabItem Name="TabItem3" Background="DimGrey" Caption="tab-1.3"> <Container Margin="5" CornerRadius="2" > <TextBox Margin="5" Multiline="true" TextAlignment="TopLeft"/> </Container> </TabItem> </TabView> - <Button Background="vgradient|0:DimGray|1:Black" HorizontalAlignment="Right" + <Button Background="vgradient|0:DimGrey|1:Black" HorizontalAlignment="Right" Caption="Add new tab" Width="Fit" Height="30" MouseDown="onAddTabButClick"/> </VerticalStack> <VerticalStack Width="40%"> @@ -36,8 +36,8 @@ <Label Text="Selected Tab:"/> <Label Text="{../../tabview2.SelectedTab}"/> </HorizontalStack> - <TabView Name="tabview2" Background="DimGray" Orientation="Horizontal" > - <TabItem Name="TabItem1" Caption="tab-2.1" Background="DimGray"> + <TabView Name="tabview2" Background="DimGrey" Orientation="Horizontal" > + <TabItem Name="TabItem1" Caption="tab-2.1" Background="DimGrey"> <VerticalStack Margin="20"> <CheckBox/> <CheckBox/> @@ -45,7 +45,7 @@ <CheckBox/> </VerticalStack> </TabItem> - <TabItem Name="TabItem2" Caption="tab-2.2" Background="DimGray"> + <TabItem Name="TabItem2" Caption="tab-2.2" Background="DimGrey"> <VerticalStack Height="Fit" Margin="10"> <RadioButton Fit="true"/> <RadioButton/> @@ -53,13 +53,13 @@ <RadioButton/> </VerticalStack> </TabItem> - <TabItem Name="TabItem3" Background="DimGray" Caption="tab-2.3"> + <TabItem Name="TabItem3" Background="DimGrey" Caption="tab-2.3"> <Container Margin="5" CornerRadius="2" > <TextBox Margin="5" Multiline="true" TextAlignment="TopLeft"/> </Container> </TabItem> </TabView> - <Button Background="vgradient|0:DimGray|1:Black" HorizontalAlignment="Right" + <Button Background="vgradient|0:DimGrey|1:Black" HorizontalAlignment="Right" Caption="Add new tab" Width="Fit" Height="30" MouseDown="onAddTabButClick2"/> </VerticalStack> </HorizontalStack> diff --git a/Tests/Interfaces/TemplatedControl/testButton.crow b/Tests/Interfaces/TemplatedControl/testButton.crow index 69367eaa..8911619d 100755 --- a/Tests/Interfaces/TemplatedControl/testButton.crow +++ b/Tests/Interfaces/TemplatedControl/testButton.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<VerticalStack Fit="true" Background="vgradient|0:DimGray|1:Black"> +<VerticalStack Fit="true" Background="vgradient|0:DimGrey|1:Black"> <HorizontalStack Fit="True"> <Button Caption="but" MouseClick="onButClick"/> <Button Caption="but" MouseClick="onButClick" Fit="true"/> diff --git a/Tests/Interfaces/TemplatedControl/testCheckbox.crow b/Tests/Interfaces/TemplatedControl/testCheckbox.crow index 5147a151..7c8438c0 100755 --- a/Tests/Interfaces/TemplatedControl/testCheckbox.crow +++ b/Tests/Interfaces/TemplatedControl/testCheckbox.crow @@ -1,11 +1,11 @@ <?xml version="1.0"?> -<VerticalStack Fit="true" Margin="100" Background="DimGray" > - <CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> - <CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> - <CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> - <CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> - <CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> - <CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> - <CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> - <CheckBox Background="Gray" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> +<VerticalStack Fit="true" Margin="100" Background="DimGrey" > + <CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> + <CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> + <CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> + <CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> + <CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> + <CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> + <CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> + <CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/> </VerticalStack> diff --git a/Tests/Interfaces/TemplatedControl/testCombobox.crow b/Tests/Interfaces/TemplatedControl/testCombobox.crow index 3ef27ace..4363986e 100755 --- a/Tests/Interfaces/TemplatedControl/testCombobox.crow +++ b/Tests/Interfaces/TemplatedControl/testCombobox.crow @@ -1,4 +1,4 @@ <?xml version="1.0"?> -<Container Background="DimGray" Width="300"> +<Container Background="DimGrey" Width="300"> <ComboBox Data="{TestList}" ItemTemplate="#Tests.Interfaces.colorItem.crow"/> </Container>
\ No newline at end of file diff --git a/Tests/Interfaces/TemplatedControl/testRadioButton.crow b/Tests/Interfaces/TemplatedControl/testRadioButton.crow index 905cdeba..a01d9041 100755 --- a/Tests/Interfaces/TemplatedControl/testRadioButton.crow +++ b/Tests/Interfaces/TemplatedControl/testRadioButton.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<VerticalStack Width="200" Height="Fit" Margin="20" Background="DimGray"> +<VerticalStack Width="200" Height="Fit" Margin="20" Background="DimGrey"> <RadioButton Caption="Radio1"/> <RadioButton Caption="Radio2" IsChecked="true"/> <RadioButton Caption="Radio3"/> diff --git a/Tests/Interfaces/TemplatedControl/testScrollbar.crow b/Tests/Interfaces/TemplatedControl/testScrollbar.crow index c494e347..f8c4a9ae 100755 --- a/Tests/Interfaces/TemplatedControl/testScrollbar.crow +++ b/Tests/Interfaces/TemplatedControl/testScrollbar.crow @@ -1,5 +1,5 @@ <?xml version="1.0"?> <Group Name="TopContainer" Width="400" Height="400" - Focusable="True" Background="Gray"> - <ScrollBar Height="Stretched" Orientation="Vertical" Width="16" Maximum="100"/> + Focusable="True" Background="Grey"> + <ScrollBar Height="16" Orientation="Horizontal" Width="Stretched" Maximum="100"/> </Group>
\ No newline at end of file diff --git a/Tests/Interfaces/TemplatedControl/testSpinner.crow b/Tests/Interfaces/TemplatedControl/testSpinner.crow index 07d62e65..01d53016 100755 --- a/Tests/Interfaces/TemplatedControl/testSpinner.crow +++ b/Tests/Interfaces/TemplatedControl/testSpinner.crow @@ -1,6 +1,6 @@ <?xml version="1.0"?> <VerticalStack Name="TopContainer" Width="400" Height="Fit" - Margin="20" Background="DarkGray"> + Margin="20" Background="DarkGrey"> <HorizontalStack Fit="true" Margin="5" Background="SkyBlue"> <Spinner Name="sp1" Value="5" ValueChanged="onSpinnerValueChange"/> diff --git a/Tests/Interfaces/basicTests/7.crow b/Tests/Interfaces/basicTests/7.crow index 8df18346..8d1e441c 100755 --- a/Tests/Interfaces/basicTests/7.crow +++ b/Tests/Interfaces/basicTests/7.crow @@ -89,11 +89,11 @@ </VerticalStack> <VerticalStack Width="33%" Margin="5" Spacing="5"> <Expandable Background="DimGray"> - <Image Path="#Crow.Images.Icons.crow.svg"/> + <Image Path="#Crow.Icons.crow.svg"/> </Expandable> <Popper Background="DimGray" PopDirection="Bottom"> <Border Fit="True" Background="DimGray" CornerRadius="0" BorderWidth="1"> - <Image Path="#Crow.Images.Icons.crow.svg" Width="100" Height="100" Margin="10" + <Image Path="#Crow.Icons.crow.svg" Width="100" Height="100" Margin="10" MouseEnter="{Background=LightGray}" MouseLeave="{Background=Transparent}"/> </Border> @@ -102,7 +102,7 @@ <Container Height="Fit" Background="Onyx" Margin="2" CornerRadius="5"> <ProgressBar Background="DimGray" Height="10" Value="50"/> </Container> - <Image Path="#Crow.Images.Icons.crow.svg" Width="60" Height="60" Background="LightGray" /> + <Image Path="#Crow.Icons.crow.svg" Width="60" Height="60" Background="LightGray" /> <TabView Name="tabview1" Height="120" Orientation="Horizontal" Spacing="15"> <TabItem Name="TabItem1" Caption="Tab 1" Margin="0"> diff --git a/Tests/Interfaces/colorItem2.crow b/Tests/Interfaces/colorItem2.crow new file mode 100755 index 00000000..4e29d380 --- /dev/null +++ b/Tests/Interfaces/colorItem2.crow @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<Border Foreground="Transparent" Focusable="true" HorizontalAlignment="Left" Height="Fit"> + <HorizontalStack Margin="0" + MouseEnter="{Background=CornflowerBlue}" + MouseLeave="{Background=Transparent}"> + <GraphicObject Height="8" Width="14" Background="{}" Margin="0" CornerRadius="2"/> + <Label Text="{}" Margin="0" Width="Stretched" Font="mono, 8"/> + </HorizontalStack> +</Border> + diff --git a/Tests/Interfaces/perfMsr.crow b/Tests/Interfaces/perfMsr.crow index d823ea42..22a62ea1 100755 --- a/Tests/Interfaces/perfMsr.crow +++ b/Tests/Interfaces/perfMsr.crow @@ -1,7 +1,7 @@ <?xml version="1.0"?> - <VerticalStack Spacing="0" Fit="true" Width="160"> - <HorizontalStack Background="Black"> + <VerticalStack Spacing="1" Height="Fit" Width="Stretched"> + <HorizontalStack Background="DarkSlateGrey"> <Label Text="{Name}" Width="Stretched" Font="doid bold, 10" Margin="2"/> <Button Caption="Reset" MouseClick="onResetClick" Height="Fit"/> </HorizontalStack> @@ -21,6 +21,9 @@ <Label Text="Maximum:" Style="FpsLabel"/> <Label Text="{maximum}" Style="FpsDisp"/> </HorizontalStack> + <Border Foreground="White" Width="Stretched" Height="60"> + <Trend Background="Black" NewValue="{current}" Minimum="0" Maximum="100"/> + </Border> <!-- <HorizontalStack> <Label Text="Total:" Style="FpsLabel"/> <Label Text="{total}" Style="FpsDisp"/> diff --git a/Tests/Interfaces/testBorder.goml.cs b/Tests/Interfaces/testBorder.goml.cs deleted file mode 100644 index 8c7663a4..00000000 --- a/Tests/Interfaces/testBorder.goml.cs +++ /dev/null @@ -1,31 +0,0 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.17020 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ - -using System; - - -namespace Crow { - - public partial class testBorder : Border { - public testBorder() { - this.BorderWidth = 5; - this.Width = 200; - this.Height = 200; - this.CornerRadius = 20; - this.Margin = 0; - this.Background = Crow.Color.Mantis; - this.SetChild(new Crow.GraphicObject()); - this.Child.CornerRadius = 0; - this.Child.Background = Crow.Color.CornflowerBlue; - this.Child.Height = 100; - this.Child.Width = 100; - } - } -} |