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 /Templates | |
| parent | 5236bd6b11d26f08ed49462252bb815314e9e7dc (diff) | |
| parent | 58ca25a123f4cf8ac959d9ad372494b0c40a41bb (diff) | |
Merge branch 'StylingImprovments'
Diffstat (limited to 'Templates')
| -rwxr-xr-x | Templates/ArrowButTemplate.crow | 8 | ||||
| -rwxr-xr-x | Templates/Button.crow | 10 | ||||
| -rwxr-xr-x | Templates/ComboBox.goml | 6 | ||||
| -rw-r--r-- | Templates/FileDialog.goml | 6 | ||||
| -rwxr-xr-x | Templates/GroupBox.goml | 4 | ||||
| -rwxr-xr-x | Templates/ListBox.goml | 4 | ||||
| -rw-r--r-- | Templates/MessageBox.goml | 6 | ||||
| -rwxr-xr-x | Templates/ScrollBar.goml | 4 | ||||
| -rw-r--r-- | Templates/ScrollingListBox.goml | 4 | ||||
| -rwxr-xr-x | Templates/Spinner.goml | 4 | ||||
| -rw-r--r-- | Templates/TreeView.crow | 2 | ||||
| -rwxr-xr-x | Templates/Window.goml | 6 | ||||
| -rwxr-xr-x | Templates/imgItemTemplate.goml | 6 |
13 files changed, 35 insertions, 35 deletions
diff --git a/Templates/ArrowButTemplate.crow b/Templates/ArrowButTemplate.crow index 8614670d..fe0e122c 100755 --- a/Templates/ArrowButTemplate.crow +++ b/Templates/ArrowButTemplate.crow @@ -1,10 +1,10 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Border Name="Content" - Background="vgradient|0:White|0,1:LightGray|0,9:LightGray|1:Black" Foreground="DarkGray" + Background="vgradient|0:White|0.1:LightGray|0.9:LightGray|1:Black" Foreground="DarkGray" Height="{../HeightPolicy}" Width="{../WidthPolicy}" MouseEnter="{Foreground=White}" MouseLeave="{Foreground=DarkGray}" - MouseDown="{Background=vgradient|0:Black|0,1:LightGray|0,9:LightGray|1:White}" - MouseUp="{Background=vgradient|0:White|0,1:LightGray|0,9:LightGray|1:Black}" + MouseDown="{Background=vgradient|0:Black|0.1:LightGray|0.9:LightGray|1:White}" + MouseUp="{Background=vgradient|0:White|0.1:LightGray|0.9:LightGray|1:Black}" > </Border>
\ No newline at end of file diff --git a/Templates/Button.crow b/Templates/Button.crow index 7d128f75..8919f7dc 100755 --- a/Templates/Button.crow +++ b/Templates/Button.crow @@ -1,10 +1,10 @@ -<?xml version="1.0"?> -<Border Background="{../Background}" MinimumSize="50;20" Height="{../HeightPolicy}" Width="{../WidthPolicy}" +<?xml version="1.0"?> +<Border Background="{../Background}" MinimumSize="50,20" Height="{../HeightPolicy}" Width="{../WidthPolicy}" Foreground="Transparent" CornerRadius="{../CornerRadius}" BorderWidth="1" - MouseEnter="{Foreground=vgradient|0:White|0,2:Gray|0,9:Gray|1:Black;caption.Foreground=White}" + MouseEnter="{Foreground=vgradient|0:White|0.2:Gray|0.9:Gray|1:Black;caption.Foreground=White}" MouseLeave="{Foreground=Transparent;caption.Foreground=LightGray}" - MouseDown="{Foreground=vgradient|0:Black|0,05:Gray|0,85:Gray|1:White}" - MouseUp="{Foreground=vgradient|0:White|0,2:Gray|0,9:Gray|1:Black}" + MouseDown="{Foreground=vgradient|0:Black|0.05:Gray|0.85:Gray|1:White}" + MouseUp="{Foreground=vgradient|0:White|0.2:Gray|0.9:Gray|1:Black}" > <!-- <Image Height="0" Width="0" Margin="0" Path="{../../Image}" SvgSub="{../../SvgSub}"/>--> <Label Font="{../../Font}" Name="caption" Margin="5" Foreground="LightGray" Text="{../../Caption}"/> diff --git a/Templates/ComboBox.goml b/Templates/ComboBox.goml index 9a5addaf..9688721a 100755 --- a/Templates/ComboBox.goml +++ b/Templates/ComboBox.goml @@ -1,10 +1,10 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Popper Name="popper" PopDirection="Bottom" Height="{../HeightPolicy}" Width="{../WidthPolicy}"> <Template> <Border CornerRadius="0" Foreground="LightGray" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"> <HorizontalStack Margin="0 " Spacing="1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"> - <TextBox MinimumSize="80;10" Margin="1" Foreground="Black" Background="White" + <TextBox MinimumSize="80,10" Margin="1" Foreground="Black" Background="White" Text="{../../../../SelectedItem}" Height="{../../../../HeightPolicy}" Width="{../../../../WidthPolicy}"/> <Button Width="14" Height="14" Focusable="false" @@ -17,7 +17,7 @@ <Border Background="DimGray" BorderWidth="1" Margin="1" MinimumSize="{../../MinimumPopupSize}" Fit="true"> <Scroller Name="scroller1" Margin="2" VerticalScrolling="true" - MaximumSize="0;200" + MaximumSize="0,200" Height="{../HeightPolicy}" Width="{../WidthPolicy}" HorizontalAlignment="Left" ValueChanged="../../../_scroller_ValueChanged"> diff --git a/Templates/FileDialog.goml b/Templates/FileDialog.goml index 3210edb8..c8a10c8d 100644 --- a/Templates/FileDialog.goml +++ b/Templates/FileDialog.goml @@ -1,16 +1,16 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Window Caption="OpenFile" Height="300" Width="500"> <VerticalStack Margin="5"> <TextBox Margin="1" Width="0" Height="-1" Text="{CurrentPath}"/> <HorizontalStack > <ListBox Data="{Directories}" Width="-1" Height="0" - Background="0,5;0,5;0,5;0,5" + Background="0.5,0.5,0.5,0.5" SelectedItemChanged="OnSelectedItemChanged" Template="#Crow.Templates.ScrollingListBox.goml" ItemTemplate="#Crow.Templates.tmpDirItem.goml" > </ListBox> <ListBox Data="{Files}" Width="0" Height="0" - Background="0,5;0,5;0,5;0,5" + Background="0.5,0.5,0.5,0.5" SelectedItemChanged="onFileListItemChanged" Template="#Crow.Templates.ScrollingListBox.goml" ItemTemplate="#Crow.Templates.imgItemTemplate.goml"> diff --git a/Templates/GroupBox.goml b/Templates/GroupBox.goml index b00af82d..d3a16613 100755 --- a/Templates/GroupBox.goml +++ b/Templates/GroupBox.goml @@ -1,8 +1,8 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Group Height="{../HeightPolicy}" Width="{../WidthPolicy}"> <Border CornerRadius="5" BorderWidth="1" Margin="6" Foreground="{../../Foreground}" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"> - <Container Name="Content" Margin="10" MinimumSize="70;10" + <Container Name="Content" Margin="10" MinimumSize="70,10" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"/> </Border> <Label Text="{../../Caption}" VerticalAlignment="Top" Left="15" diff --git a/Templates/ListBox.goml b/Templates/ListBox.goml index 8a8ec0d7..7ea306a9 100755 --- a/Templates/ListBox.goml +++ b/Templates/ListBox.goml @@ -1,5 +1,5 @@ -<?xml version="1.0"?> -<Border BorderWidth="1" Margin="1" MinimumSize="10;10" Height="{../HeightPolicy}" Width="{../WidthPolicy}" > +<?xml version="1.0"?> +<Border BorderWidth="1" Margin="1" MinimumSize="10,10" Height="{../HeightPolicy}" Width="{../WidthPolicy}" > <Scroller Name="scroller1" Margin="1" VerticalScrolling="true" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}" ValueChanged="../../_scroller_ValueChanged"> diff --git a/Templates/MessageBox.goml b/Templates/MessageBox.goml index b8b54724..eef85052 100644 --- a/Templates/MessageBox.goml +++ b/Templates/MessageBox.goml @@ -1,8 +1,8 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Border Height="{../HeightPolicy}" Width="{../WidthPolicy}" BorderWidth="1" Foreground="White" CornerRadius="10" > - <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}" Background="0,4;0,4;0,4;0,4"> + <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}" Background="0.4,0.4,0.4,0.4"> <Border BorderWidth="1" Foreground="White" Width="{../../../WidthPolicy}" Height="-1" - Background="0,1;0,5;1,0;0,5"> + Background="0.1,0.5;1,0,0.5"> <HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../WidthPolicy}" Height="-1" > <GraphicObject Width="5" Height="5"/> <Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/> diff --git a/Templates/ScrollBar.goml b/Templates/ScrollBar.goml index ffcc121e..1310443d 100755 --- a/Templates/ScrollBar.goml +++ b/Templates/ScrollBar.goml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Border BorderWidth="1" Foreground="LightGray" Width="{../WidthPolicy}" Height="{../HeightPolicy}"> <GenericStack Orientation="{../../Orientation}" Spacing="0" Width="{../../WidthPolicy}" Height="{../../HeightPolicy}"> @@ -12,7 +12,7 @@ Maximum="{../../../Maximum}" LargeIncrement="{../../../LargeIncrement}" SmallIncrement="{../../../SmallIncrement}" - Background="hgradient|0:DimGray|0,1:Gray|0,95:Gray|1:White" + Background="hgradient|0:DimGray|0.1:Gray|0.95:Gray|1:White" Width="{../../../WidthPolicy}" Height="{../../../HeightPolicy}" ValueChanged="../../../onSliderValueChange"/> <Button MouseRepeat="true" Width="12" Height="12" MouseClick="../../../onScrollForth" diff --git a/Templates/ScrollingListBox.goml b/Templates/ScrollingListBox.goml index 7976e3d7..5d9a572d 100644 --- a/Templates/ScrollingListBox.goml +++ b/Templates/ScrollingListBox.goml @@ -1,10 +1,10 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Border BorderWidth="1" Height="{../HeightPolicy}" Width="{../WidthPolicy}"> <HorizontalStack Margin="1" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}" > <Scroller Name="scroller1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}" Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Value}" ValueChanged="../../../_scroller_ValueChanged"> - <VerticalStack Width="{../../../../WidthPolicy}" Height="-1" MinimumSize="10;10" + <VerticalStack Width="{../../../../WidthPolicy}" Height="-1" MinimumSize="10,10" Name="List" Margin="0" VerticalAlignment="Top" LayoutChanged="../../../../_list_LayoutChanged"/> </Scroller> diff --git a/Templates/Spinner.goml b/Templates/Spinner.goml index 03986175..0669b228 100755 --- a/Templates/Spinner.goml +++ b/Templates/Spinner.goml @@ -1,5 +1,5 @@ -<?xml version="1.0"?> -<HorizontalStack MinimumSize="40;10" Name="hstack" Margin="0" Spacing="0" Height="{../HeightPolicy}" Width="{../WidthPolicy}"> +<?xml version="1.0"?> +<HorizontalStack MinimumSize="40,10" Name="hstack" Margin="0" Spacing="0" Height="{../HeightPolicy}" Width="{../WidthPolicy}"> <Border BorderWidth="1" Height="{../../HeightPolicy}" Width="80%" Background="White" Foreground="DimGray" Margin="0"> <Label Foreground="DimGray" Height="{../../../HeightPolicy}" Width="Stretched" diff --git a/Templates/TreeView.crow b/Templates/TreeView.crow index 165cea1c..32e3db21 100644 --- a/Templates/TreeView.crow +++ b/Templates/TreeView.crow @@ -1,4 +1,4 @@ -<Border Background="DimGray" BorderWidth="1" Margin="1" MinimumSize="100;100" +<Border Background="DimGray" BorderWidth="1" Margin="1" MinimumSize="100,100" Width="{../WidthPolicy}" Height="{../HeightPolicy}"> <VerticalStack Height="0" Width="0" Name="List" Margin="0" VerticalAlignment="Top"/> diff --git a/Templates/Window.goml b/Templates/Window.goml index 5ce4347c..42bc2976 100755 --- a/Templates/Window.goml +++ b/Templates/Window.goml @@ -1,10 +1,10 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <Border BorderWidth="1" Foreground="White" CornerRadius="20" Height="{../HeightPolicy}" Width="{../WidthPolicy}" MouseEnter="../onBorderMouseEnter" MouseLeave="../onBorderMouseLeave"> <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"> <Border Name="TitleBar" BorderWidth="1" Foreground="White" Width="{../../../WidthPolicy}" Height="Fit" - Background="vgradient|0:0,4;0,6;0,0;0,5|1:0,0;0,8;0,8;0,9"> + Background="vgradient|0:0.4,0.6,0.0,0.5|1:0.0,0.8,0.8,0.9"> <HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../WidthPolicy}" Height="Fit" > <GraphicObject Width="5"/> @@ -18,6 +18,6 @@ <GraphicObject Width="5"/> </HorizontalStack> </Border> - <Container Name="Content" MinimumSize="50;50" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}" Background="0,5;0,5;0,5;0,5"/> + <Container Name="Content" MinimumSize="50,50" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}" Background="0.5,0.5,0.5,0.5"/> </VerticalStack> </Border>
\ No newline at end of file diff --git a/Templates/imgItemTemplate.goml b/Templates/imgItemTemplate.goml index 39354891..c08f390e 100755 --- a/Templates/imgItemTemplate.goml +++ b/Templates/imgItemTemplate.goml @@ -1,8 +1,8 @@ -<?xml version="1.0"?> +<?xml version="1.0"?> <VerticalStack Width="0" Height="-1" Focusable="true" MouseEnter="{Background=BlueCrayola}" 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"/> + <Image Width="-1" Height="-1" Path="{FullName}" MaximumSize="80,80"/> + <Label Text="{Name}" Width="-1" Height="-1" Margin="0" MaximumSize="100,0"/> </VerticalStack> |