diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-07-05 16:06:33 +0200 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2018-07-05 16:06:33 +0200 |
| commit | f1531e562b4ecd9d568a28c2fffe7ffed06c728a (patch) | |
| tree | 5a57801140c6e4e8c17af7d76cb47d388af811a4 | |
| parent | 1e0f4190cb8f130802a207642d3b17111aa11b77 (diff) | |
remove old colors name, debug Scrollers
29 files changed, 169 insertions, 178 deletions
diff --git a/Crow.Test/Interfaces/5.crow b/Crow.Test/Interfaces/5.crow index b9b8ee29..7238ae45 100755 --- a/Crow.Test/Interfaces/5.crow +++ b/Crow.Test/Interfaces/5.crow @@ -57,7 +57,7 @@ <Spinner Value="100" Width="0"/> </VerticalStack> </HorizontalStack> -<!--<HorizontalStack Fit="true" Background="BlueCrayola" Margin="5"> +<!--<HorizontalStack Fit="true" Background="RoyalBlue" Margin="5"> <GraphicObject Background="Red" Width="30" Height="20"/> <Spinner Maximum="10000000000" SmallIncrement="10" Value="0"/> <GraphicObject Background="Green" Width="30" Height="20"/> diff --git a/CrowIDE/ui/LQIsExplorer.crow b/CrowIDE/ui/LQIsExplorer.crow index 72a36fbd..a3317e47 100644 --- a/CrowIDE/ui/LQIsExplorer.crow +++ b/CrowIDE/ui/LQIsExplorer.crow @@ -7,7 +7,7 @@ <VerticalStack Height="{./HeightPolicy}" Width="{./WidthPolicy}"> <VerticalStack Fit="true" Margin="3" Background="DimGray" HorizontalAlignment="Left" - MouseEnter="{Background=hgradient|0:BlueCrayola|1:Transparent}" + MouseEnter="{Background=hgradient|0:RoyalBlue|1:Transparent}" MouseLeave="{Background=DimGray}"> <Label Text="{FullName}" Font="droid, 8" Background="LightGray" Foreground="Black"/> <HorizontalStack Fit="true" Spacing="10"> @@ -42,7 +42,7 @@ <Template> <VerticalStack Height="{./HeightPolicy}" Width="{./WidthPolicy}"> <HorizontalStack Spacing="1" Height="Fit" Width="{./WidthPolicy}" - MouseEnter="{Background=hgradient|0:BlueCrayola|1:Transparent}" + MouseEnter="{Background=hgradient|0:RoyalBlue|1:Transparent}" MouseLeave="{Background=Transparent}"> <Image Margin="2" Width="12" Height="12" diff --git a/CrowIDE/ui/MembersView.template b/CrowIDE/ui/MembersView.template index 49f4e190..ef66b2e0 100755 --- a/CrowIDE/ui/MembersView.template +++ b/CrowIDE/ui/MembersView.template @@ -5,8 +5,7 @@ </Border> <HorizontalStack> <Scroller Name="scroller1" Margin="1" - Background="{./Background}" - ScrollY="{../scrollbar1.Value}"> + Background="{./Background}"> <VerticalStack Spacing="1" Height="Fit" Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/> </Scroller> @@ -14,8 +13,8 @@ Name="scrollbar1" LargeIncrement="{../scroller1.PageHeight}" SmallIncrement="30" CursorSize="{../scroller1.ChildHeightRatio}" - Value="{../scroller1.ScrollY}" - Maximum="{../scroller1.MaximumScroll}" + Value="{²../scroller1.ScrollY}" + Maximum="{../scroller1.MaxScrollY}" Width="14" Orientation="Vertical"/> </HorizontalStack> </VerticalStack> diff --git a/Images/screenshot.png b/Images/screenshot.png Binary files differindex e2f802f2..3540d6b1 100644 --- a/Images/screenshot.png +++ b/Images/screenshot.png diff --git a/Templates/FileItems.template b/Templates/FileItems.template index 99d7b6a9..452a402a 100644 --- a/Templates/FileItems.template +++ b/Templates/FileItems.template @@ -6,14 +6,14 @@ <Image Margin="2" Width="16" Height="16" Path="#Crow.Icons.file.svg"/> <Label Text="{Name}" Width="Stretched" - MouseEnter="{Background=BlueCrayola}" + MouseEnter="{Background=RoyalBlue}" MouseLeave="{Background=Transparent}"/> </HorizontalStack> </ItemTemplate> <ItemTemplate DataType="System.IO.DirectoryInfo"> <Border Foreground="Transparent" Focusable="true" Height="Fit"> <HorizontalStack - MouseEnter="{Background=BlueCrayola}" + MouseEnter="{Background=RoyalBlue}" MouseLeave="{Background=Transparent}"> <Image Margin="2" Width="16" Height="16" Path="#Crow.Icons.folder.svg"/> diff --git a/Templates/ScrollingListBox.template b/Templates/ScrollingListBox.template index 3b098df2..1e7304f0 100644 --- a/Templates/ScrollingListBox.template +++ b/Templates/ScrollingListBox.template @@ -2,13 +2,13 @@ <Border BorderWidth="1" Background="{./Background}"> <HorizontalStack Margin="1"> <Scroller Name="scroller1" - Margin="2" ScrollY="{../scrollbar1.Value}"> + Margin="2"> <VerticalStack Height="Fit" MinimumSize="10,10" Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/> </Scroller> <ScrollBar Name="scrollbar1" Value="{²../scroller1.ScrollY}" LargeIncrement="{../scroller1.PageHeight}" SmallIncrement="30" CursorSize="{../scroller1.ChildHeightRatio}" - Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" + Maximum="{../scroller1.MaxScrollY}" Orientation="Vertical" Width="14" /> </HorizontalStack> </Border> diff --git a/Templates/imgItem.template b/Templates/imgItem.template index c08f390e..9dbf23d5 100755 --- a/Templates/imgItem.template +++ b/Templates/imgItem.template @@ -1,6 +1,6 @@ <?xml version="1.0"?> <VerticalStack Width="0" Height="-1" Focusable="true" - MouseEnter="{Background=BlueCrayola}" + MouseEnter="{Background=RoyalBlue}" MouseLeave="{Background=Transparent}"> <Image Width="-1" Height="-1" Path="{FullName}" MaximumSize="80,80"/> <Label Text="{Name}" Width="-1" Height="-1" Margin="0" MaximumSize="100,0"/> diff --git a/Tests/Interfaces/Divers/0.crow b/Tests/Interfaces/Divers/0.crow index afb7db06..d98668c0 100755 --- a/Tests/Interfaces/Divers/0.crow +++ b/Tests/Interfaces/Divers/0.crow @@ -52,7 +52,7 @@ </HorizontalStack> <HorizontalStack Height="Fit" Margin="5"> <Label Text="MouseEvents" Width="50%" Margin="3" - Background="DimGray" + Background="Jet" Foreground="DimGray" TextAlignment="Center" MouseEnter="{Foreground=White}" @@ -60,9 +60,9 @@ MouseDown="{Background=DarkRed}" MouseClick="{Foreground=Green}" MouseDoubleClick="{Foreground=Yellow}" - MouseUp="{Background=DimGray}"/> + MouseUp="{Background=Jet}"/> <Label Text="MouseEvents" Width="50%" Margin="3" - Background="DimGray" + Background="Jet" Foreground="DimGray" TextAlignment="Center" MouseClick="{Foreground=Green}" diff --git a/Tests/Interfaces/Divers/3.crow b/Tests/Interfaces/Divers/3.crow index 84d8a783..5ec5c696 100755 --- a/Tests/Interfaces/Divers/3.crow +++ b/Tests/Interfaces/Divers/3.crow @@ -5,373 +5,373 @@ <HorizontalStack Fit="true"> <Label Text="Memory:" Width="50" TextAlignment="Right"/> <Label Text="{memory}" Font="droid,12" TextAlignment="Center" - Background="vgradient|0:BlueCrayola|1:Black"/> + Background="vgradient|0:RoyalBlue|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> </VerticalStack> <VerticalStack Fit="true" Name="vsFps" Spacing="10" > <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> </VerticalStack> <VerticalStack Fit="true" Name="vsFps" Spacing="10" > <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> </VerticalStack> <VerticalStack Fit="true" Name="vsFps" Spacing="10" > <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> </VerticalStack> </HorizontalStack>
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/5.crow b/Tests/Interfaces/Divers/5.crow index 34ee42c3..53040f93 100755 --- a/Tests/Interfaces/Divers/5.crow +++ b/Tests/Interfaces/Divers/5.crow @@ -57,7 +57,7 @@ <Spinner Value="100" Width="Stretched"/> </VerticalStack>--> </HorizontalStack> -<!--<HorizontalStack Fit="true" Background="BlueCrayola" Margin="5"> +<!--<HorizontalStack Fit="true" Background="RoyalBlue" Margin="5"> <GraphicObject Background="Red" Width="30" Height="20"/> <Spinner Maximum="10000000000" SmallIncrement="10" Value="0"/> <GraphicObject Background="Green" Width="30" Height="20"/> diff --git a/Tests/Interfaces/Divers/clip0.crow b/Tests/Interfaces/Divers/clip0.crow index 2ebea9ff..8cdf459b 100755 --- a/Tests/Interfaces/Divers/clip0.crow +++ b/Tests/Interfaces/Divers/clip0.crow @@ -5,6 +5,6 @@ MouseLeave="{Background=LimeGreen}"> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="false" MouseEnter="{Background=DimGray}" Width="100" - MouseLeave="{Background=BlueCrayola}" - Margin="10" Text="{drawing}" Background="BlueCrayola"/> + 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 4aeb7fde..1e202d90 100755 --- a/Tests/Interfaces/Divers/clip1.crow +++ b/Tests/Interfaces/Divers/clip1.crow @@ -17,8 +17,8 @@ MouseLeave="{Background=LimeGreen}"> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" MouseEnter="{Background=DimGray}" - MouseLeave="{Background=BlueCrayola}" - Margin="1" Text="{drawing}" Background="BlueCrayola"/> + MouseLeave="{Background=RoyalBlue}" + Margin="1" Text="{drawing}" Background="RoyalBlue"/> </Container> </Container> </Container> diff --git a/Tests/Interfaces/Divers/clip2.crow b/Tests/Interfaces/Divers/clip2.crow index 4f95bf90..198d9113 100755 --- a/Tests/Interfaces/Divers/clip2.crow +++ b/Tests/Interfaces/Divers/clip2.crow @@ -9,7 +9,7 @@ MouseLeave="{Background=LimeGreen}"> <Label Left="10" HorizontalAlignment="Right" VerticalAlignment="Center" CacheEnabled="true" MouseEnter="{Background=DimGray}" Width="100" - MouseLeave="{Background=BlueCrayola}" - Margin="10" Text="{drawing}" Background="BlueCrayola"/> + MouseLeave="{Background=RoyalBlue}" + Margin="10" Text="{drawing}" Background="RoyalBlue"/> </Group> </Group>
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/clip3.crow b/Tests/Interfaces/Divers/clip3.crow index b08216c0..2bb7c357 100755 --- a/Tests/Interfaces/Divers/clip3.crow +++ b/Tests/Interfaces/Divers/clip3.crow @@ -10,12 +10,12 @@ MouseLeave="{Background=LimeGreen}"> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" MouseEnter="{Background=DimGray}" Width="100" - MouseLeave="{Background=BlueCrayola}" - Margin="10" Text="{fps}" Background="BlueCrayola"/> + MouseLeave="{Background=RoyalBlue}" + Margin="10" Text="{fps}" Background="RoyalBlue"/> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" MouseEnter="{Background=DimGray}" Width="100" - MouseLeave="{Background=BlueCrayola}" - Margin="10" Text="{drawing}" Background="BlueCrayola"/> + MouseLeave="{Background=RoyalBlue}" + Margin="10" Text="{drawing}" Background="RoyalBlue"/> </VerticalStack> <VerticalStack Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false" HorizontalAlignment="Right" VerticalAlignment="Bottom" @@ -23,12 +23,12 @@ MouseLeave="{Background=LimeGreen}"> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" MouseEnter="{Background=DimGray}" Width="100" - MouseLeave="{Background=BlueCrayola}" - Margin="10" Text="{fpsMax}" Background="BlueCrayola"/> + MouseLeave="{Background=RoyalBlue}" + Margin="10" Text="{fpsMax}" Background="RoyalBlue"/> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" MouseEnter="{Background=DimGray}" Width="100" - MouseLeave="{Background=BlueCrayola}" - Margin="10" Text="{fpsMin}" Background="BlueCrayola"/> + MouseLeave="{Background=RoyalBlue}" + Margin="10" Text="{fpsMin}" Background="RoyalBlue"/> </VerticalStack> </HorizontalStack> </Group>
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/clip4.crow b/Tests/Interfaces/Divers/clip4.crow index 852a4e87..71a887ab 100755 --- a/Tests/Interfaces/Divers/clip4.crow +++ b/Tests/Interfaces/Divers/clip4.crow @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Border Fit="true" BorderWidth="2" > <Scroller CornerRadius="2" Height="200" Width="300" Background="DimGray" Margin="2"> - <VerticalStack Margin="10" VerticalAlignment="Top" Fit="true" Background="vgradient|0:BlueCrayola|1:Black" > + <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"/> @@ -35,7 +35,7 @@ MouseEnter="{Background=Gray}" MouseLeave="{Background=LimeGreen}"> - <CheckBox Margin="20" Background="BlueCrayola"/> + <CheckBox Margin="20" Background="RoyalBlue"/> <CheckBox/> <CheckBox/> <CheckBox/> @@ -49,10 +49,10 @@ <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" MouseEnter="{Background=DimGray}" Width="100" - MouseLeave="{Background=BlueCrayola}" - Margin="10" Text="{fps}" Background="BlueCrayola"/> + MouseLeave="{Background=RoyalBlue}" + Margin="10" Text="{fps}" Background="RoyalBlue"/> <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true" MouseEnter="{Background=DimGray}" Width="100" - MouseLeave="{Background=BlueCrayola}" - Margin="10" Text="{drawing}" Background="BlueCrayola"/> + MouseLeave="{Background=RoyalBlue}" + Margin="10" Text="{drawing}" Background="RoyalBlue"/> </VerticalStack>-->
\ No newline at end of file diff --git a/Tests/Interfaces/Divers/fps.crow b/Tests/Interfaces/Divers/fps.crow index 6747bbd2..1d515a15 100755 --- a/Tests/Interfaces/Divers/fps.crow +++ b/Tests/Interfaces/Divers/fps.crow @@ -5,19 +5,19 @@ <VerticalStack Fit="true" Name="vsFps" Spacing="10" > <HorizontalStack Fit="true"> <Label Text="Update:" Width="50" TextAlignment="Right"/> - <Label Margin="5" Name="labUpdate" Text="{update}" Font="droid,12" Background="AoEnglish" Width="50" TextAlignment="Center"/> + <Label Margin="5" Name="labUpdate" Text="{update}" Font="droid,12" Background="SeaGreen" Width="50" TextAlignment="Center"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> - <Label Margin="5" Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/> + <Label Margin="5" Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="SeaGreen"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> - <Label Margin="5" Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/> + <Label Margin="5" Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" Background="SeaGreen"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> - <Label Margin="5" Text="{fpsMax}" Font="droid , 12" Background="AoEnglish" Width="50" TextAlignment="Center"/> + <Label Margin="5" Text="{fpsMax}" Font="droid , 12" Background="SeaGreen" Width="50" TextAlignment="Center"/> </HorizontalStack> </VerticalStack> </Container> diff --git a/Tests/Interfaces/Divers/testDisable.crow b/Tests/Interfaces/Divers/testDisable.crow index 2300a013..85a3d3b9 100644 --- a/Tests/Interfaces/Divers/testDisable.crow +++ b/Tests/Interfaces/Divers/testDisable.crow @@ -4,8 +4,8 @@ <Label Font="20" Text="Enable / Disable test"/> <Label Text="{fps}" IsEnabled="false" Font="30"/> <Label Text="{fps}" IsEnabled="true" Font="30"/> - <Label Text="{fps}" IsEnabled="false" Font="30" Background="SeaBlue"/> - <Label Text="{fps}" IsEnabled="true" Font="30" Background="SeaBlue"/> + <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" /> diff --git a/Tests/Interfaces/Divers/testOutOfClipUpdate.crow b/Tests/Interfaces/Divers/testOutOfClipUpdate.crow index 5e4e4177..738f2b11 100755 --- a/Tests/Interfaces/Divers/testOutOfClipUpdate.crow +++ b/Tests/Interfaces/Divers/testOutOfClipUpdate.crow @@ -1,6 +1,6 @@ <?xml version="1.0"?> <Container Width="200" Height="100" Background="DimGray" Margin="5"> <Container Width="Stretched" Height="800" Background="DarkBlue"> - <Label Text="{fps}" Background="BlueCrayola" VerticalAlignment="Center"/> + <Label Text="{fps}" Background="RoyalBlue" VerticalAlignment="Center"/> </Container> </Container> diff --git a/Tests/Interfaces/Divers/testShape.crow b/Tests/Interfaces/Divers/testShape.crow index c75af67d..4adada39 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:BlueCrayola|1:Black}" + MouseEnter="{Background=hgradient|0:DimGray|0.5:RoyalBlue|1:Black}" MouseLeave="{Background=DimGray}"/> </Container>
\ No newline at end of file diff --git a/Tests/Interfaces/TemplatedContainer/0.crow b/Tests/Interfaces/TemplatedContainer/0.crow index 195b981b..e600d37c 100755 --- a/Tests/Interfaces/TemplatedContainer/0.crow +++ b/Tests/Interfaces/TemplatedContainer/0.crow @@ -7,7 +7,7 @@ <CheckBox Name="chk4" /> <HorizontalStack Fit="true" Margin="2" Background="SeaGreen"> <Label Name="captionFps" Text="Fps:" Width="30" TextAlignment="Right"/> - <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="Fit" TextAlignment="Center" Background="AoEnglish"/> + <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="Fit" TextAlignment="Center" Background="SeaGreen"/> </HorizontalStack> </VerticalStack> </Expandable> diff --git a/Tests/Interfaces/TemplatedContainer/6.crow b/Tests/Interfaces/TemplatedContainer/6.crow index 041bdf52..c1362017 100755 --- a/Tests/Interfaces/TemplatedContainer/6.crow +++ b/Tests/Interfaces/TemplatedContainer/6.crow @@ -4,9 +4,9 @@ <Expandable Width="Stretched" Background="LimeGreen"> <Expandable Width="Stretched" Background="DimGray"> <Expandable Width="Stretched" Background="Yellow"> - <Expandable Width="Stretched" Background="NavyBlue"> + <Expandable Width="Stretched" Background="SeaGreen"> <Expandable Width="Stretched" Background="Blue"> - <Expandable Width="Stretched" Background="BlueCrayola"> + <Expandable Width="Stretched" Background="RoyalBlue"> <Expandable Width="Stretched" Background="Green"> <Label Background="Red" Text="{fps}"/> </Expandable> diff --git a/Tests/Interfaces/TemplatedContainer/7.crow b/Tests/Interfaces/TemplatedContainer/7.crow index 0c94b6c4..648b7a82 100755 --- a/Tests/Interfaces/TemplatedContainer/7.crow +++ b/Tests/Interfaces/TemplatedContainer/7.crow @@ -7,9 +7,9 @@ <Expandable Background="LimeGreen"> <Expandable Background="DimGray"> <Expandable Width="Stretched" Background="Yellow"> - <Expandable Background="NavyBlue"> + <Expandable Background="SeaGreen"> <Expandable Width="Stretched" Background="Blue"> - <Expandable Width="Stretched" Background="BlueCrayola"> + <Expandable Width="Stretched" Background="RoyalBlue"> <Expandable Width="Stretched" Background="Green"> <Label Background="Red" Text="{fps}"/> </Expandable> diff --git a/Tests/Interfaces/TemplatedContainer/testPopper.crow b/Tests/Interfaces/TemplatedContainer/testPopper.crow index 0c579d95..07e56b80 100755 --- a/Tests/Interfaces/TemplatedContainer/testPopper.crow +++ b/Tests/Interfaces/TemplatedContainer/testPopper.crow @@ -10,7 +10,7 @@ </Border> <GraphicObject Height="200"/> <Popper Caption="TestPopper" Width="100" Background="DimGray" PopDirection="{alignment}"> - <Border Fit="True" Background="ArmyGreen"> + <Border Fit="True" Background="SteelBlue"> <Image Fit="true" Path="#go.Images.Icons.tetra.png" Margin="10"/> <VerticalStack Fit="true" Margin="10" Background="CornflowerBlue"> <CheckBox Name="chk1" Background="Red"/> @@ -19,7 +19,7 @@ <CheckBox Name="chk4"/> <HorizontalStack Fit="true" Margin="20"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> - <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/> + <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="SeaGreen"/> </HorizontalStack> </VerticalStack> </Border> diff --git a/Tests/Interfaces/TemplatedContainer/testWindow.goml b/Tests/Interfaces/TemplatedContainer/testWindow.goml index d27d02b8..3142012f 100755 --- a/Tests/Interfaces/TemplatedContainer/testWindow.goml +++ b/Tests/Interfaces/TemplatedContainer/testWindow.goml @@ -29,37 +29,37 @@ <HorizontalStack Fit="true"> <Label Text="Layouting:" Width="50" TextAlignment="Right"/> <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Clipping:" Width="50" TextAlignment="Right"/> <Label Text="{update}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Drawing:" Width="50" TextAlignment="Right"/> <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/> <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Min:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> <HorizontalStack Fit="true"> <Label Text="Max:" Width="50" TextAlignment="Right"/> <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" - Background="vgradient|0:AoEnglish|1:Black"/> + Background="vgradient|0:SeaGreen|1:Black"/> </HorizontalStack> </VerticalStack> </Container> </Border> - <HorizontalStack Fit="true" Background="BlueCrayola" Margin="3"> + <HorizontalStack Fit="true" Background="RoyalBlue" Margin="3"> <GraphicObject Margin="10" Background="LimeGreen" Width="5" Height="5"/> <TextBox Font="droid, 16" Multiline="true" Text="this is a test\nmultiline" Margin="2"/> <GraphicObject Margin="10" Background="LimeGreen" Width="5" Height="5"/> diff --git a/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow index 90c475a5..1dcef800 100755 --- a/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow +++ b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow @@ -6,14 +6,13 @@ <Template> <Border BorderWidth="1"> <HorizontalStack Margin="1"> - <Scroller Name="scroller1" - Margin="2" ScrollY="{../scrollbar1.Value}"> + <Scroller Name="scroller1" Margin="2"> <VerticalStack Height="Fit" MinimumSize="10,10" Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/> </Scroller> <ScrollBar Name="scrollbar1" Value="{²../scroller1.ScrollY}" LargeIncrement="{../scroller1.PageHeight}" SmallIncrement="30" CursorSize="{../scroller1.ChildHeightRatio}" - Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" + Maximum="{../scroller1.MaxScrollY}" Orientation="Vertical" Width="14" /> </HorizontalStack> </Border> diff --git a/Tests/Interfaces/Wrapper/2.2.crow b/Tests/Interfaces/Wrapper/2.2.crow index 246a937d..c6dfbf8d 100755 --- a/Tests/Interfaces/Wrapper/2.2.crow +++ b/Tests/Interfaces/Wrapper/2.2.crow @@ -1,39 +1,32 @@ <?xml version="1.0"?> <Window Caption="Horizontal Wrapper" Width="50%" Height="50%"> - <VerticalStack Margin="1"> - <Scroller Name="scroller1" ScrollX="{../scrollbar1.Value}" Margin="1" Background="BlueCrayola"> - <Wrapper HorizontalAlignment="Left" Orientation="Horizontal" Height="100%" Width="Fit" Margin="0" Background="MediumSeaGreen" Spacing="1" > - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50%" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50%" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50%" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50%" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50%" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50%" Background="SeaGreen"/> - <GraphicObject Width="50" Height="50" Background="SeaGreen"/> - </Wrapper> - </Scroller> - <ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollX}" - Maximum="{../scroller1.MaximumScroll}" Orientation="Horizontal" - Height="14" /> - </VerticalStack> + <Wrapper HorizontalAlignment="Left" Orientation="Horizontal" Height="100%" Width="Fit" Margin="0" Background="MediumSeaGreen" Spacing="1" > + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50%" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50%" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50%" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50%" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50%" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50%" Background="SeaGreen"/> + <GraphicObject Width="50" Height="50" Background="SeaGreen"/> + </Wrapper> </Window>
\ No newline at end of file diff --git a/Tests/Interfaces/tmpDirItem.goml b/Tests/Interfaces/tmpDirItem.goml index 4d401faf..41665d13 100755 --- a/Tests/Interfaces/tmpDirItem.goml +++ b/Tests/Interfaces/tmpDirItem.goml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <HorizontalStack Width="Fit" Height="Fit" Focusable="true" HorizontalAlignment="Left" - MouseEnter="{Background=BlueCrayola}" + MouseEnter="{Background=RoyalBlue}" MouseLeave="{Background=Transparent}"> <Image Width="16" Height="16" Path="#Tests.image.folder1.svg" SvgSub="{Attributes}"/> <Label Text="{Name}" Width="Fit" Height="Fit" Margin="0"/> diff --git a/Tests/test.style b/Tests/test.style index bbe53513..5539b3d0 100644 --- a/Tests/test.style +++ b/Tests/test.style @@ -14,15 +14,15 @@ FpsDisp { } CheckBox2 { Template= "#Tests.Interfaces.CheckBox2.imlt"; - Background = "DimGray"; - Checked="{Background=MediumSeaGreen;Font=droid bold, 10}"; - Unchecked = "{Background=DarkGray;Font=droid,10}"; + Background = "Jet"; + Checked="{Background=MediumSeaGreen}"; + Unchecked = "{Background=Jet}"; } RadioButton2 { Template="#Tests.Interfaces.CheckBox2.imlt"; - Background = "DimGray"; - Checked = "{Background=MediumSeaGreen;Font=droid bold, 10}"; - Unchecked = "{Background=DimGray;Font=droid,10}"; + Background = "Jet"; + Checked = "{Background=MediumSeaGreen}"; + Unchecked = "{Background=Jet}"; } labPerf { Font = "droid, 8"; diff --git a/Tests/ui/showcase.crow b/Tests/ui/showcase.crow index 61df4443..956e236d 100755 --- a/Tests/ui/showcase.crow +++ b/Tests/ui/showcase.crow @@ -16,7 +16,7 @@ <ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}" LargeIncrement="{../scroller1.PageHeight}" SmallIncrement="30" CursorSize="{../scroller1.ChildHeightRatio}" - Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" + Maximum="{../scroller1.MaxScrollY}" Orientation="Vertical" Width="14" /> </HorizontalStack> <Label Visible="{ShowError}" Text="{ErrorMessage}" Background="Red" Foreground="White" Width="Stretched" Margin="2" |