diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-07-31 12:29:20 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-07-31 12:29:20 +0200 |
| commit | 9a8f162ca773a0a4b8748e631d53935dfd9831dc (patch) | |
| tree | 70d93447dbfaaf7b04474ddb7542a34bf4faed10 /Tests/ui | |
| parent | 5236bd6b11d26f08ed49462252bb815314e9e7dc (diff) | |
| parent | 58ca25a123f4cf8ac959d9ad372494b0c40a41bb (diff) | |
Merge branch 'StylingImprovments'
Diffstat (limited to 'Tests/ui')
| -rw-r--r-- | Tests/ui/LabelButton.style | 16 | ||||
| -rw-r--r-- | Tests/ui/MenuItem.style | 22 | ||||
| -rwxr-xr-x | Tests/ui/test.crow | 6 | ||||
| -rwxr-xr-x | Tests/ui/tmpWindow.crow | 4 |
4 files changed, 24 insertions, 24 deletions
diff --git a/Tests/ui/LabelButton.style b/Tests/ui/LabelButton.style index d376121f..617cfb8e 100644 --- a/Tests/ui/LabelButton.style +++ b/Tests/ui/LabelButton.style @@ -1,8 +1,8 @@ -MouseEnter = {Background = Gray;Foreground = White} -Fit = true -MouseLeave = {Background=Transparent;Foreground=Gray} -MouseDown = {Background=Red;Foreground=White} -MouseUp = {Background=Gray;Foreground=White} -Foreground=Gray -Margin=5 -CornerRadius=5 +MouseEnter = {Background = Gray;Foreground = White;} +Fit = true; +MouseLeave = {Background=Transparent;Foreground=Gray;} +MouseDown = {Background=Red;Foreground=White;} +MouseUp = {Background=Gray;Foreground=White;} +Foreground=Gray; +Margin=5; +CornerRadius=5; diff --git a/Tests/ui/MenuItem.style b/Tests/ui/MenuItem.style index 8011ebcc..bce8e730 100644 --- a/Tests/ui/MenuItem.style +++ b/Tests/ui/MenuItem.style @@ -1,11 +1,11 @@ -Height = Fit -Width = Stretched -MinimumSize=60;10 -Margin=2 -CornerRadius=0 -TextAlignment=Left -Foreground=Gray -MouseEnter = {Background=SeaGreen;Foreground=White} -MouseLeave = {Background=Transparent;Foreground=Gray} -MouseDown = {Background=White;Foreground=DimGray} -MouseUp = {Background=SeaGreen;Foreground=White} +Height = Fit; +Width = Stretched; +MinimumSize=60;10; +Margin=2; +CornerRadius=0; +TextAlignment=Left; +Foreground=Gray; +MouseEnter = {Background=SeaGreen;Foreground=White;} +MouseLeave = {Background=Transparent;Foreground=Gray;} +MouseDown = {Background=White;Foreground=DimGray;} +MouseUp = {Background=SeaGreen;Foreground=White;} diff --git a/Tests/ui/test.crow b/Tests/ui/test.crow index d293a65e..da776371 100755 --- a/Tests/ui/test.crow +++ b/Tests/ui/test.crow @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Window Font="droid bold, 10" Title="Open GL" HorizontalAlignment="Left" Width="30%" Height="90%"> <VerticalStack> <HorizontalStack Background="Jet" Height="Fit" Width="Stretched" Margin="2"> @@ -18,8 +18,8 @@ </HorizontalStack> <GroupBox Caption="Object Rotation" Margin="10" Width="70%" Height="Fit" > <VerticalStack Spacing="10"> - <Spinner Width="50%" Maximum="1,0" SmallIncrement="0,01" Value="{²RotationSpeed}"/> - <Slider Height="10" Width="50%" Maximum="1,0" SmallIncrement="0,01" Value="{²RotationSpeed}"/> + <Spinner Width="50%" Maximum="1,0" SmallIncrement="0.01" Value="{²RotationSpeed}"/> + <Slider Height="10" Width="50%" Maximum="1,0" SmallIncrement="0.01" Value="{²RotationSpeed}"/> <CheckBox IsChecked="{²ClockWiseRotation}" Caption="Clockwise Rotation"/> <GroupBox Caption="Rotation Axis" Height="Fit" > <VerticalStack> diff --git a/Tests/ui/tmpWindow.crow b/Tests/ui/tmpWindow.crow index 08a7d58a..824ad704 100755 --- a/Tests/ui/tmpWindow.crow +++ b/Tests/ui/tmpWindow.crow @@ -1,9 +1,9 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Border BorderWidth="1" Foreground="White" CornerRadius="15" Height="{../HeightPolicy}" Width="{../WidthPolicy}" MouseEnter="../onBorderMouseEnter" MouseLeave="../onBorderMouseLeave" - Background="vgradient|0:0,6;0,6;0,6;0,9|1:0,4;0,4;0,4;0,6"> + Background="vgradient|0:0.6,0.6,0.6,0.9|1:0.4,0.4,0.4,0.6"> <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"> <HorizontalStack Height="Fit" Width="{../../../WidthPolicy}"> <Label Margin="2" Font="{../../../../Font}" Text="{../../../../Title}" Width="Stretched"/> |