From dca4d91d401ba718eccb83d6be42a12f55919838 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 30 Jul 2016 10:00:02 +0200
Subject: remove style attributes, add ';' to style files line ending, new
 style parser

---
 src/Interface.cs | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'src/Interface.cs')

diff --git a/src/Interface.cs b/src/Interface.cs
index b8426e6f..d8f66443 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -22,6 +22,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Xml;
@@ -54,6 +55,7 @@ namespace Crow
 		public Interface(){
 			LayoutingQueue = new Queue<LayoutingQueueItem>();
 			Interface.CurrentInterface = this;
+			LoadStyling ();
 		}
 		#endregion
 
@@ -259,7 +261,48 @@ namespace Crow
 				return tmp;
 			}
 		}
+		public Dictionary<string, Dictionary<string, string>> Styling;
 
+		public void LoadStyling() {
+			Styling = new Dictionary<string, Dictionary<string, string>> ();
+
+			//fetch styling info in this order, if member styling is alreadey referenced in previous
+			//assembly, it's ignored
+			loadStylingFromAssembly (Assembly.GetEntryAssembly ());
+			loadStylingFromAssembly (Assembly.GetExecutingAssembly ());
+		}
+
+		void loadStylingFromAssembly (Assembly assembly) { 
+			foreach (string s in assembly
+					.GetManifestResourceNames ()
+					 .Where (r => r.EndsWith (".style", StringComparison.OrdinalIgnoreCase))) {
+
+				StyleReader sr = new StyleReader (assembly, s);
+									
+			}
+		}
+
+		//public static bool TryGetStyle (Type crowType, out Stream stream) {			
+		//	string styleId = crowType.Name + ".style";
+
+		//	if (tryGetStyle (Assembly.GetEntryAssembly (), styleId, out stream))
+		//		return true;
+		//	if (tryGetStyle (Assembly.GetExecutingAssembly (), styleId, out stream))
+		//		return true;			
+		//	return false;
+		//}
+
+		//static bool tryGetStyle (Assembly assembly, string styleId, out Stream stream) { 
+		//	try {
+		//		stream = assembly.GetManifestResourceStream (
+		//				assembly.GetManifestResourceNames ().FirstOrDefault (r => r.EndsWith
+		//															  (styleId, StringComparison.OrdinalIgnoreCase)));
+		//	} catch {
+		//		stream = null;
+		//		return false;
+		//	}
+		//	return true;
+		//}
 		#endregion
 
 		#if MEASURE_TIME
-- 
cgit v1.3.1-4-g156e


From 6c6fb760bfb6a956a3413abfb56571a11113acd3 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 30 Jul 2016 12:42:25 +0200
Subject: replace ';' separator between members by ',' and set '.' as decimal
 mark in files

---
 Styles/MessageBox.style                             |  2 +-
 Styles/Window.style                                 |  2 +-
 Templates/ArrowButTemplate.crow                     |  8 ++++----
 Templates/Button.crow                               |  8 ++++----
 Templates/FileDialog.goml                           |  6 +++---
 Templates/MessageBox.goml                           |  6 +++---
 Templates/ScrollBar.goml                            |  4 ++--
 Templates/Window.goml                               |  6 +++---
 Templates/imgItemTemplate.goml                      |  4 ++--
 Tests/Interfaces/Divers/fps.crow                    |  4 ++--
 Tests/Interfaces/Divers/testBorder.crow             |  4 ++--
 Tests/Interfaces/Divers/testGrid.crow               | 10 +++++-----
 Tests/Interfaces/Divers/testWindow.goml             |  8 ++++----
 Tests/Interfaces/Divers/testWindow2.goml            |  8 ++++----
 Tests/Interfaces/Divers/testWindow3.goml            |  6 +++---
 Tests/Interfaces/Divers/test_Listbox.crow           |  4 ++--
 Tests/Interfaces/Nouveau dossier/test4.1.crow       |  6 +++---
 Tests/Interfaces/Nouveau dossier/test4.crow         |  4 ++--
 Tests/Interfaces/Nouveau dossier/test6.crow         |  6 +++---
 Tests/Interfaces/Nouveau dossier/testColorList.crow |  4 ++--
 Tests/Interfaces/Nouveau dossier/testDirViewer.crow |  4 ++--
 Tests/OpenTKGameWindow.cs                           |  2 ++
 Tests/ui/test.crow                                  |  6 +++---
 Tests/ui/tmpWindow.crow                             |  4 ++--
 src/Colors.cs                                       |  4 ++--
 src/GraphicObjects/GraphicObject.cs                 | 18 ++++++++++++------
 src/Interface.cs                                    | 11 +++++++++++
 src/Point.cs                                        |  4 ++--
 src/Rectangle.cs                                    |  4 ++--
 src/Size.cs                                         |  2 +-
 30 files changed, 94 insertions(+), 75 deletions(-)

(limited to 'src/Interface.cs')

diff --git a/Styles/MessageBox.style b/Styles/MessageBox.style
index 1f562c11..914fbb97 100644
--- a/Styles/MessageBox.style
+++ b/Styles/MessageBox.style
@@ -2,4 +2,4 @@
 Height=Fit;
 Title=MessageBox;
 Focusable=true;
-MinimumSize=150;80;
+MinimumSize=150,80;
diff --git a/Styles/Window.style b/Styles/Window.style
index 22ee20e2..26422233 100644
--- a/Styles/Window.style
+++ b/Styles/Window.style
@@ -1,3 +1,3 @@
 Focusable=true;
-MinimumSize=50;50;
+MinimumSize=50,50;
 Fit=true;
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..a9e45dc3 100755
--- a/Templates/Button.crow
+++ b/Templates/Button.crow
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?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/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/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/Window.goml b/Templates/Window.goml
index 5ce4347c..01f88a22 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..792d2758 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"/>
+		<Label Text="{Name}" Width="-1" Height="-1" Margin="0" MaximumSize="100,0"/>
 	</VerticalStack>
 
diff --git a/Tests/Interfaces/Divers/fps.crow b/Tests/Interfaces/Divers/fps.crow
index 18f96c02..b6962302 100755
--- a/Tests/Interfaces/Divers/fps.crow
+++ b/Tests/Interfaces/Divers/fps.crow
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border Fit="true" CornerRadius="5" BorderWidth="1">
-	<Container Name="MainGrp" Background="0,5;0,5;0,5;0,4" Width="120" Fit="true"
+	<Container Name="MainGrp" Background="0.5,0.5,0.5,0.4" Width="120" Fit="true"
 		Margin="10" Focusable="True" >
 			<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 				<HorizontalStack Fit="true">
diff --git a/Tests/Interfaces/Divers/testBorder.crow b/Tests/Interfaces/Divers/testBorder.crow
index cae3c33d..40ba7cf1 100755
--- a/Tests/Interfaces/Divers/testBorder.crow
+++ b/Tests/Interfaces/Divers/testBorder.crow
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border BorderWidth="2" Width="200" Height="200" CornerRadius="2" Margin="0" 
-		Background="vgradient|0,65:Mantis|1:Transparent">
+		Background="vgradient|0.65:Mantis|1:Transparent">
 	<GraphicObject CornerRadius="20" Background="#Tests.image.crow0.svg" Margin="0" Height="100" Width="120" />
 </Border>
diff --git a/Tests/Interfaces/Divers/testGrid.crow b/Tests/Interfaces/Divers/testGrid.crow
index a336c1ed..327d7716 100755
--- a/Tests/Interfaces/Divers/testGrid.crow
+++ b/Tests/Interfaces/Divers/testGrid.crow
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Grid RowCount="2" ColumnCount="2">
-	<GraphicObject Background="0,0;0,0;0,0;1,0"/>
-	<GraphicObject Background="0,0;0,0;0,5;1,0"/>
-	<GraphicObject Background="0,0;0,5;0,0;1,0"/>
-	<GraphicObject Background="0,5;0,0;0,0;1,0"/>
+	<GraphicObject Background="0.0,0.0,0.0;1,0"/>
+	<GraphicObject Background="0.0,0.0,0.5;1,0"/>
+	<GraphicObject Background="0.0,0.5,0.0;1,0"/>
+	<GraphicObject Background="0.5,0.0,0.0;1,0"/>
 </Grid>
\ No newline at end of file
diff --git a/Tests/Interfaces/Divers/testWindow.goml b/Tests/Interfaces/Divers/testWindow.goml
index fd24b50f..154577fb 100755
--- a/Tests/Interfaces/Divers/testWindow.goml
+++ b/Tests/Interfaces/Divers/testWindow.goml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Window Left="10" Top="10" Title="Test window" 
 		Width="250" Height="550" >
-	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10" Background="0,4;0,4;0,4;0,4">
+	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10" Background="0.4,0.4,0.4,0.4">
 		<Slider Name="slider" Height="12" Width="Stretched" CornerRadius="3"/>
 		<GroupBox Caption="test"  Height="Fit" Width="Stretched" Margin="5">
 			<VerticalStack  Height="Fit" Width="Stretched" >
@@ -17,13 +17,13 @@
 			<RadioButton Width="80" Height="Fit" Caption="Radio 3" />
 		</HorizontalStack>
 		<HorizontalStack Width="Stretched" Height="Stretched" MinimumSize="10;10" Margin="10" CornerRadius="5"
-				Background="vgradient|0:White|0,1:SteelBlue|0,9:SteelBlue|1:Transparent">
+				Background="vgradient|0:White|0.1:SteelBlue|0.9:SteelBlue|1:Transparent">
 			<CheckBox Height="Fit" Width="80"/>
 			<GraphicObject Width="Stretched"/>
 			<CheckBox Height="Fit" Width="80" IsChecked="true"/>
 		</HorizontalStack>
 		<Border Fit="true" CornerRadius="5" BorderWidth="1" >
-			<Container Name="MainGrp" Background="0,5;0,5;0,5;0,4" Width="120" Fit="true"
+			<Container Name="MainGrp" Background="0.5,0.5,0.5,0.4" Width="120" Fit="true"
 				Margin="10" Focusable="True" >
 					<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 						<HorizontalStack Fit="true">
diff --git a/Tests/Interfaces/Divers/testWindow2.goml b/Tests/Interfaces/Divers/testWindow2.goml
index d7c441e6..e67061c6 100755
--- a/Tests/Interfaces/Divers/testWindow2.goml
+++ b/Tests/Interfaces/Divers/testWindow2.goml
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
-<Window Name="window1" Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0,5;0,5;0,5;0,8" 
+<?xml version="1.0"?>
+<Window Name="window1" Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0.5,0.5,0.5,0.8" 
 	Focusable="True"  CornerRadius="20" MinimumSize="100;100" MaximumSize="500;500">
 	<Template>
 		<Border BorderWidth="1" Foreground="White" CornerRadius="20" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
 			<VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}">
 				<Border BorderWidth="1" Foreground="White" Width="{../../../WidthPolicy}" Height="Fit" 
-						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="Fit" >
 						<GraphicObject Width="5"/>
 						<Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>
@@ -18,7 +18,7 @@
 						<GraphicObject Width="5"/>
 					</HorizontalStack>
 				</Border>
-				<Container Name="Content" Height="{../../../../HeightPolicy}" Width="{../../../../WidthPolicy}" Background="0,5;0,5;0,5;0,5"/>
+				<Container Name="Content" Height="{../../../../HeightPolicy}" Width="{../../../../WidthPolicy}" Background="0.5,0.5,0.5,0.5"/>
 			</VerticalStack>
 		</Border>
 	</Template>
diff --git a/Tests/Interfaces/Divers/testWindow3.goml b/Tests/Interfaces/Divers/testWindow3.goml
index c1784c5d..54b573d8 100755
--- a/Tests/Interfaces/Divers/testWindow3.goml
+++ b/Tests/Interfaces/Divers/testWindow3.goml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
-<Window Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0,5;0,5;0,5;0,8" 
+<?xml version="1.0"?>
+<Window Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0.5,0.5,0.5,0.8" 
 	Focusable="True"  CornerRadius="20" MinimumSize="100;100" MaximumSize="500;500">
 	<Template>
-		<Container Margin="20" Name="Content" Height="{../HeightPolicy}" Width="{../WidthPolicy}" Background="0,5;0,5;0,5;0,5"/>
+		<Container Margin="20" Name="Content" Height="{../HeightPolicy}" Width="{../WidthPolicy}" Background="0.5,0.5,0.5,0.5"/>
 	</Template>
 <!--	<Group Background="Green">-->
 		<GraphicObject Height="50" Width="50" Background="Red" Margin="5"/>
diff --git a/Tests/Interfaces/Divers/test_Listbox.crow b/Tests/Interfaces/Divers/test_Listbox.crow
index 0cbc4e2a..61b673aa 100755
--- a/Tests/Interfaces/Divers/test_Listbox.crow
+++ b/Tests/Interfaces/Divers/test_Listbox.crow
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--<ListBox Data="{TestList}" Focusable="true"/>-->
 <Border Margin="50">
 	<VerticalStack >
 		<Label Text="{../ColorList.SelectedItem}" Background="DarkGreen"/>
 		<Label Text="{Hover}" Background="DarkGreen"/>
 		<Button Caption="Clear" Width="Stretched" MouseClick="OnClear"/>
-		<ListBox Name="ColorList" Data="{TestList}" Background="0,5;0,5;0,5;0,5"
+		<ListBox Name="ColorList" Data="{TestList}" Background="0.5,0.5,0.5,0.5"
 					 HorizontalAlignment="Center" Width="Fit" Height="200" Margin="0"
 					 ItemTemplate="#Tests.Interfaces.colorItem.crow"
 					 Template="#Crow.Templates.ScrollingListBox.goml">
diff --git a/Tests/Interfaces/Nouveau dossier/test4.1.crow b/Tests/Interfaces/Nouveau dossier/test4.1.crow
index 1cc40e3b..2ac55cd0 100755
--- a/Tests/Interfaces/Nouveau dossier/test4.1.crow	
+++ b/Tests/Interfaces/Nouveau dossier/test4.1.crow	
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Group Name="MainGrp"
 	Width="800" Height="500"
-	Background="0,5;0,5;0,5;0,5" Foreground="White"
+	Background="0.5,0.5,0.5,0.5" Foreground="White"
 	Margin="10" >
 	<Border 
 		BorderWidth="2" Foreground="Transparent"
@@ -12,7 +12,7 @@
 		<HorizontalStack Name="hs0" Fit="true"
 			WidgetSpacing="10" 
 			VerticalAlignment="Center" 
-			Background="0,5;0,5;0,5;0,5">
+			Background="0.5,0.5,0.5,0.5">
 			<VerticalStack Name="vs1"
 				Margin="20" Width="400" Height="Fit">
 				<Label Name="labMouse" Text="MousePos"/>
diff --git a/Tests/Interfaces/Nouveau dossier/test4.crow b/Tests/Interfaces/Nouveau dossier/test4.crow
index eb200fcc..06476f31 100755
--- a/Tests/Interfaces/Nouveau dossier/test4.crow	
+++ b/Tests/Interfaces/Nouveau dossier/test4.crow	
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Group Name="MainGrp"
 	Width="800" Height="500"
-	Background="0,5;0,5;0,5;0,5" Foreground="White"
+	Background="0.5,0.5,0.5,0.5" Foreground="White"
 	Margin="10" >
 	<Border Margin="10" CornerRadius="10"
 		Name="mainBorder"
diff --git a/Tests/Interfaces/Nouveau dossier/test6.crow b/Tests/Interfaces/Nouveau dossier/test6.crow
index f75d46c7..532450da 100755
--- a/Tests/Interfaces/Nouveau dossier/test6.crow	
+++ b/Tests/Interfaces/Nouveau dossier/test6.crow	
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border BorderWidth="1" Foreground="White" CornerRadius="10" Width="500" Height="300">
-	<VerticalStack Height="Stretched" Background="0,4;0,4;0,4;0,4">
-		<Border BorderWidth="1" Foreground="White"  Height="20" Background="0,1;0,5;1,0;0,5">
+	<VerticalStack Height="Stretched" Background="0.4,0.4,0.4,0.4">
+		<Border BorderWidth="1" Foreground="White"  Height="20" Background="0.1,0.5;1,0,0.5">
 			<HorizontalStack Name="hs" Margin="1" Spacing="1" Height="Fit" >
 				<GraphicObject Width="5"/>
 				<Image Name="Image" Margin="1" Width="12" Height="12" Path="#go.Images.Icons.tetra.png"/>
diff --git a/Tests/Interfaces/Nouveau dossier/testColorList.crow b/Tests/Interfaces/Nouveau dossier/testColorList.crow
index ccbbb094..8a5c592f 100755
--- a/Tests/Interfaces/Nouveau dossier/testColorList.crow	
+++ b/Tests/Interfaces/Nouveau dossier/testColorList.crow	
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border BorderWidth="2" Fit="true">
 	<VerticalStack Fit="true" Margin="5">
-		<ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,7"
+		<ListBox Data="{TestList}" Background="0.5,0.5,0.5,0.7"
 					 HorizontalAlignment="Center" Width="200" Height="200" Margin="5"
 					 ItemTemplate="#Tests.Interfaces.colorItem.crow">
 			<Template>
diff --git a/Tests/Interfaces/Nouveau dossier/testDirViewer.crow b/Tests/Interfaces/Nouveau dossier/testDirViewer.crow
index ec32d763..c63e5483 100755
--- a/Tests/Interfaces/Nouveau dossier/testDirViewer.crow	
+++ b/Tests/Interfaces/Nouveau dossier/testDirViewer.crow	
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 
 	<VerticalStack Height="Fit" Width="Fit" Name="hstack" Margin="0" Spacing="Stretched">
 		<Border Height="Fit" Width="200" BorderWidth="2" CornerRadius="10">
 			<Label Name="labName" Text="{Name}" Width="Stretched" Height="Fit"/>
 		</Border>
 		<ListBox Data="{GetFileSystemInfos}" Width="Fit" Height="400"
-			Background="0,5;0,5;0,5;0,5"
+			Background="0.5,0.5,0.5,0.5"
 			SelectedItemChanged="OnSelectedItemChanged" 
 			ItemTemplate="Interfaces/tmpDirItem.goml" >
 			<Template>
diff --git a/Tests/OpenTKGameWindow.cs b/Tests/OpenTKGameWindow.cs
index 381f86c8..379f89f1 100644
--- a/Tests/OpenTKGameWindow.cs
+++ b/Tests/OpenTKGameWindow.cs
@@ -107,6 +107,8 @@ namespace Crow
 
 		void interfaceThread()
 		{
+			Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+
 			CrowInterface.Quit += Quit;
 			CrowInterface.MouseCursorChanged += CrowInterface_MouseCursorChanged;
 			while (CrowInterface.ClientRectangle.Size.Width == 0)
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"/>
diff --git a/src/Colors.cs b/src/Colors.cs
index 269d7ae6..751fb252 100644
--- a/src/Colors.cs
+++ b/src/Colors.cs
@@ -1012,7 +1012,7 @@ namespace Crow
 		#region IXmlSerializable
 		public void ReadXml(System.Xml.XmlReader reader)
         {
-            string[] c = reader["Color"].Split(new char[] { ';' });            
+            string[] c = reader["Color"].Split(new char[] { ',' });            
             R = double.Parse(c[0]);
             G = double.Parse(c[1]);
             B = double.Parse(c[2]);
@@ -1061,7 +1061,7 @@ namespace Crow
 				}
 			}
 
-			return string.Format("{0};{1};{2};{3}", R, G, B, A);
+			return string.Format("{0},{1},{2},{3}", R, G, B, A);
 		}
 
         public static object Parse(string s)
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 433599c1..3eaa91f1 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -82,8 +82,8 @@ namespace Crow
 		protected bool _isVisible = true;
 		VerticalAlignment _verticalAlignment = VerticalAlignment.Center;
 		HorizontalAlignment _horizontalAlignment = HorizontalAlignment.Center;
-		Size _maximumSize = "0;0";
-		Size _minimumSize = "0;0";
+		Size _maximumSize = "0,0";
+		Size _minimumSize = "0,0";
 		bool cacheEnabled = false;
 		object dataSource;
 		string style;
@@ -419,7 +419,7 @@ namespace Crow
 				NotifyValueChanged ("Visible", _isVisible);
 			}
 		}
-		[XmlAttributeAttribute()][DefaultValue("1;1")]
+		[XmlAttributeAttribute()][DefaultValue("1,1")]
 		public virtual Size MinimumSize {
 			get { return _minimumSize; }
 			set {
@@ -432,7 +432,7 @@ namespace Crow
 				RegisterForLayouting (LayoutingType.Sizing);
 			}
 		}
-		[XmlAttributeAttribute()][DefaultValue("0;0")]
+		[XmlAttributeAttribute()][DefaultValue("0,0")]
 		public virtual Size MaximumSize {
 			get { return _maximumSize; }
 			set {
@@ -539,9 +539,15 @@ namespace Crow
 					else
 						name = xaa.AttributeName;
 				}
-				if (styling.ContainsKey (name)) {
 
-				} else {
+				bool memberHasStyle = false;
+				if (styling != null){
+					if (styling.ContainsKey (name))
+						memberHasStyle = true;
+				} 
+				if (memberHasStyle){
+					
+				}else {
 					if (name == "Style") {
 						//retrieve default value from class attribute
 						//DefaultStyle defStyle = thisType.GetCustomAttribute<DefaultStyle>();
diff --git a/src/Interface.cs b/src/Interface.cs
index d8f66443..2636b60a 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -204,6 +204,9 @@ namespace Crow
 		}
 		public static GraphicObject Load (string path, object hostClass = null)
 		{
+			System.Globalization.CultureInfo savedCulture = Thread.CurrentThread.CurrentCulture;
+			Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+
 			Interface.XmlLoaderCount ++;
 			CurrentGOMLPath = path;
 			GraphicObject tmp = null;
@@ -211,6 +214,9 @@ namespace Crow
 				tmp = Load(stream, GetTopContainerOfGOMLStream(stream), hostClass);
 			}
 			Interface.XmlLoaderCount --;
+
+			Thread.CurrentThread.CurrentCulture = savedCulture;
+
 			return tmp;
 		}
 		public static GraphicObject Load (Stream stream, Type type, object hostClass = null)
@@ -264,12 +270,17 @@ namespace Crow
 		public Dictionary<string, Dictionary<string, string>> Styling;
 
 		public void LoadStyling() {
+			System.Globalization.CultureInfo savedCulture = Thread.CurrentThread.CurrentCulture;
+			Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+
 			Styling = new Dictionary<string, Dictionary<string, string>> ();
 
 			//fetch styling info in this order, if member styling is alreadey referenced in previous
 			//assembly, it's ignored
 			loadStylingFromAssembly (Assembly.GetEntryAssembly ());
 			loadStylingFromAssembly (Assembly.GetExecutingAssembly ());
+
+			Thread.CurrentThread.CurrentCulture = savedCulture;
 		}
 
 		void loadStylingFromAssembly (Assembly assembly) { 
diff --git a/src/Point.cs b/src/Point.cs
index 76beaa99..ba0103e3 100644
--- a/src/Point.cs
+++ b/src/Point.cs
@@ -130,7 +130,7 @@ namespace Crow
 
         public override string ToString()
         {
-			return string.Format("({0};{1})", X, Y);
+			return string.Format("({0},{1})", X, Y);
         }
 
         public override bool Equals(object obj)
@@ -145,7 +145,7 @@ namespace Crow
 		{
 			if (string.IsNullOrEmpty (s))
 				return default(Point);
-			string[] d = s.Trim().Split(';');
+			string[] d = s.Trim().Split(',');
 			if (d.Length == 2)
 				return new Point (int.Parse (d [0]), int.Parse (d [1]));
 			else if (d.Length == 1) {
diff --git a/src/Rectangle.cs b/src/Rectangle.cs
index e9445224..9a4ef396 100644
--- a/src/Rectangle.cs
+++ b/src/Rectangle.cs
@@ -236,11 +236,11 @@ namespace Crow
         }
         public override string ToString()
         {
-            return string.Format("{0};{1};{2};{3}", X, Y, Width, Height);
+            return string.Format("{0},{1},{2},{3}", X, Y, Width, Height);
         }
         public static Rectangle Parse(string s)
         {
-            string[] d = s.Split(new char[] { ';' });
+            string[] d = s.Split(new char[] { ',' });
             return new Rectangle(
                 int.Parse(d[0]),
                 int.Parse(d[1]),
diff --git a/src/Size.cs b/src/Size.cs
index 21ddb539..5059d31a 100644
--- a/src/Size.cs
+++ b/src/Size.cs
@@ -153,7 +153,7 @@ namespace Crow
 		}
 		public static Size Parse(string s)
 		{
-			string[] d = s.Split(new char[] { ';' });
+			string[] d = s.Split(new char[] { ',' });
 			return d.Length == 1 ? new Size(int.Parse(d[0])) : new Size(
 				int.Parse(d[0]),
 				int.Parse(d[1]));
-- 
cgit v1.3.1-4-g156e


From d690d2f5f862af5766e4496f9a92671d490ad806 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 30 Jul 2016 17:01:40 +0200
Subject: cumulative styling

---
 Styles/Slider.style                 |  2 +-
 Tests/OpenTKGameWindow.cs           |  4 +--
 src/GraphicObjects/GraphicObject.cs | 49 ++++++++++++++++++++-----------------
 src/Interface.cs                    | 40 ++++++------------------------
 src/StyleReader.cs                  | 48 +++++++++++++++++++++++++-----------
 5 files changed, 70 insertions(+), 73 deletions(-)

(limited to 'src/Interface.cs')

diff --git a/Styles/Slider.style b/Styles/Slider.style
index 7e4f6068..5b60e6af 100644
--- a/Styles/Slider.style
+++ b/Styles/Slider.style
@@ -1,4 +1,4 @@
-Background = vgradient|0:Black|0,1:Gray|0,9:Gray|1:LightGray;
+Background = vgradient|0:Black|0.1:Gray|0.9:Gray|1:LightGray;
 Foreground = Gray;
 Focusable = true;
 Fit = true;
diff --git a/Tests/OpenTKGameWindow.cs b/Tests/OpenTKGameWindow.cs
index 379f89f1..2b3bdb24 100644
--- a/Tests/OpenTKGameWindow.cs
+++ b/Tests/OpenTKGameWindow.cs
@@ -316,12 +316,12 @@ namespace Crow
 		#region keyboard Handling
 		void Keyboard_KeyDown(object sender, OpenTK.Input.KeyboardKeyEventArgs otk_e)
 		{
-			//if (!CrowInterface.ProcessKeyDown((int)otk_e.Key))
+			if (!CrowInterface.ProcessKeyDown((int)otk_e.Key))
 				KeyboardKeyDown.Raise (this, otk_e);
         }
 		void Keyboard_KeyUp(object sender, OpenTK.Input.KeyboardKeyEventArgs otk_e)
 		{
-			//if (!CrowInterface.ProcessKeyUp((int)otk_e.Key))
+			if (!CrowInterface.ProcessKeyUp((int)otk_e.Key))
 				KeyboardKeyUp.Raise (this, otk_e);
 		}
 		void OpenTKGameWindow_KeyPress (object sender, OpenTK.KeyPressEventArgs e)
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 26a7a59d..b8291783 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -492,7 +492,7 @@ namespace Crow
 		string getDefaultStyleResId (Type t) {
 			string [] tmp = t.FullName.Split ('.');
 			string res = tmp [0] + ".Styles";
-			for (int i = 1; i < tmp.Length; i++)			
+			for (int i = 1; i < tmp.Length; i++)
 				res += "." + tmp [i];
 			return res;
 		}
@@ -509,7 +509,7 @@ namespace Crow
 				return;
 			}
 
-			Dictionary<string, string> styling = null;
+			List<Dictionary<string, string>> styling = new List<Dictionary<string, string>>();
 
 			//Search for a style mathing :
 			//1: Full class name, with full namespace
@@ -518,15 +518,14 @@ namespace Crow
 			//   those files being placed in a Styles folder
 
 			if (Interface.CurrentInterface.Styling.ContainsKey (thisType.FullName))
-				styling = Interface.CurrentInterface.Styling [thisType.FullName];
-			else if (Interface.CurrentInterface.Styling.ContainsKey (thisType.Name))
-				styling = Interface.CurrentInterface.Styling [thisType.Name];
-			else {
-				string styleFullName = getDefaultStyleResId (thisType);
-				if (Interface.CurrentInterface.Styling.ContainsKey (styleFullName)) 
-					styling = Interface.CurrentInterface.Styling [styleFullName];
-			}
-				                                             
+				styling.Add (Interface.CurrentInterface.Styling [thisType.FullName]);
+			if (Interface.CurrentInterface.Styling.ContainsKey (thisType.Name))
+				styling.Add (Interface.CurrentInterface.Styling [thisType.Name]);
+			
+			string styleFullName = getDefaultStyleResId (thisType);
+			if (Interface.CurrentInterface.Styling.ContainsKey (styleFullName))
+				styling.Add (Interface.CurrentInterface.Styling [styleFullName]);
+			
 			//Reflexion being very slow compared to dyn method or delegates,
 			//I compile the initial values coded in the CustomAttribs of the class,
 			//all other instance of this type would not longer use reflexion to init properly
@@ -564,13 +563,17 @@ namespace Crow
 						name = xaa.AttributeName;
 				}
 
-				bool memberHasStyle = false;
-				if (styling != null){
-					if (styling.ContainsKey (name))
-						memberHasStyle = true;
-				} 
-				if (memberHasStyle){
-					defaultValue = styling [name];
+				int styleIndex = -1;
+				if (styling.Count > 0){
+					for (int i = 0; i < styling.Count; i++) {
+						if (styling[i].ContainsKey (name)){
+							styleIndex = i;
+							break;
+						}
+					}
+				}
+				if (styleIndex >= 0){
+					defaultValue = styling[styleIndex] [name];
 				}else {
 					if (name == "Style") {
 						//retrieve default value from class attribute
@@ -662,7 +665,7 @@ namespace Crow
 					if (pi.PropertyType == typeof (string))
 						il.Emit (OpCodes.Ldstr, Convert.ToString (defaultValue));
 					else {
-						MethodInfo miParse = pi.PropertyType.GetMethod 
+						MethodInfo miParse = pi.PropertyType.GetMethod
 						                       ("Parse", BindingFlags.Static | BindingFlags.Public,
 						                        Type.DefaultBinder, new Type [] {typeof (string)},null);
 						if (miParse == null)
@@ -722,7 +725,7 @@ namespace Crow
 		protected Size contentSize;
 		/// <summary> return size of content + margins </summary>
 		protected virtual int measureRawSize (LayoutingType lt) {
-			return lt == LayoutingType.Width ? 
+			return lt == LayoutingType.Width ?
 				contentSize.Width + 2 * Margin: contentSize.Height + 2 * Margin;
 		}
 		/// <summary> By default in groups, LayoutingType.ArrangeChildren is reset </summary>
@@ -848,7 +851,7 @@ namespace Crow
 					}
 				} else
 					Slot.Y = Top;
-				
+
 				if (LastSlots.Y == Slot.Y)
 					break;
 
@@ -920,7 +923,7 @@ namespace Crow
 					}
 				} else
 					Slot.Height = 0;
-				
+
 				if (LastSlots.Height == Slot.Height)
 					break;
 
@@ -928,7 +931,7 @@ namespace Crow
 
 				OnLayoutChanges (layoutType);
 
-				LastSlots.Height = Slot.Height;	
+				LastSlots.Height = Slot.Height;
 				break;
 			}
 
diff --git a/src/Interface.cs b/src/Interface.cs
index 2636b60a..b8b06918 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -34,7 +34,7 @@ namespace Crow
 	/// <summary>
 	/// The Interface Class is the top container of the application.
 	/// It provides the Dirty bitmap and zone of the interface to be drawn on screen
-	/// 
+	///
 	/// The Interface contains :
 	/// 	- rendering and layouting queues and logic.
 	/// 	- helpers to load XML interfaces files
@@ -53,7 +53,6 @@ namespace Crow
 			FontRenderingOptions.SubpixelOrder = SubpixelOrder.Rgb;
 		}
 		public Interface(){
-			LayoutingQueue = new Queue<LayoutingQueueItem>();
 			Interface.CurrentInterface = this;
 			LoadStyling ();
 		}
@@ -89,11 +88,9 @@ namespace Crow
 		public static FontOptions FontRenderingOptions;
 		#endregion
 
-		/// <summary>
-		/// The layouting queue contains layouting commands
-		/// </summary>
-		public Queue<LayoutingQueueItem> LayoutingQueue;
+		public Queue<LayoutingQueueItem> LayoutingQueue = new Queue<LayoutingQueueItem> ();
 		public Queue<GraphicObject> GraphicUpdateQueue = new Queue<GraphicObject>();
+		public Dictionary<string, Dictionary<string, string>> Styling;
 		public string Clipboard;
 		public static void RegisterForGraphicUpdate(GraphicObject g)
 		{
@@ -267,7 +264,6 @@ namespace Crow
 				return tmp;
 			}
 		}
-		public Dictionary<string, Dictionary<string, string>> Styling;
 
 		public void LoadStyling() {
 			System.Globalization.CultureInfo savedCulture = Thread.CurrentThread.CurrentCulture;
@@ -276,44 +272,22 @@ namespace Crow
 			Styling = new Dictionary<string, Dictionary<string, string>> ();
 
 			//fetch styling info in this order, if member styling is alreadey referenced in previous
-			//assembly, it's ignored
+			//assembly, it's ignored.
 			loadStylingFromAssembly (Assembly.GetEntryAssembly ());
 			loadStylingFromAssembly (Assembly.GetExecutingAssembly ());
 
 			Thread.CurrentThread.CurrentCulture = savedCulture;
 		}
 
-		void loadStylingFromAssembly (Assembly assembly) { 
+		void loadStylingFromAssembly (Assembly assembly) {
 			foreach (string s in assembly
 					.GetManifestResourceNames ()
 					 .Where (r => r.EndsWith (".style", StringComparison.OrdinalIgnoreCase))) {
 
 				StyleReader sr = new StyleReader (assembly, s);
-									
+				sr.Dispose ();
 			}
 		}
-
-		//public static bool TryGetStyle (Type crowType, out Stream stream) {			
-		//	string styleId = crowType.Name + ".style";
-
-		//	if (tryGetStyle (Assembly.GetEntryAssembly (), styleId, out stream))
-		//		return true;
-		//	if (tryGetStyle (Assembly.GetExecutingAssembly (), styleId, out stream))
-		//		return true;			
-		//	return false;
-		//}
-
-		//static bool tryGetStyle (Assembly assembly, string styleId, out Stream stream) { 
-		//	try {
-		//		stream = assembly.GetManifestResourceStream (
-		//				assembly.GetManifestResourceNames ().FirstOrDefault (r => r.EndsWith
-		//															  (styleId, StringComparison.OrdinalIgnoreCase)));
-		//	} catch {
-		//		stream = null;
-		//		return false;
-		//	}
-		//	return true;
-		//}
 		#endregion
 
 		#if MEASURE_TIME
@@ -766,7 +740,7 @@ namespace Crow
 		#endregion
 
 		#region Keyboard
-		public bool ProcessKeyDown(int Key){			
+		public bool ProcessKeyDown(int Key){
 			if (_focusedWidget == null)
 				return false;
 			KeyboardKeyEventArgs e = new KeyboardKeyEventArgs((Crow.Key)Key, false, Keyboard);
diff --git a/src/StyleReader.cs b/src/StyleReader.cs
index c1cc28bf..5060b3d9 100644
--- a/src/StyleReader.cs
+++ b/src/StyleReader.cs
@@ -40,6 +40,8 @@ namespace Crow
 			List<string> targetsClasses = new List<string> ();
 			string currentProperty = "";
 
+			int curlyBracketCount = 0;
+
 			while (!EndOfStream) {
 				char c = (Char)Read ();
 
@@ -90,25 +92,43 @@ namespace Crow
 						token += c;
 					break;
 				case readerState.expression:
-					if (c == ';') {
-						if (!string.IsNullOrEmpty (token)) {
-							string expression = token.Trim ();
+					if (curlyBracketCount == 0) {
+						if (c == '{'){
+							if (string.IsNullOrEmpty(token))
+								throw new Exception ("Unexpected token '{'");
+							curlyBracketCount++;
+							token = "{";
+						}else if (c == '}')
+							throw new Exception ("Unexpected token '{'");
+						else if (c == ';') {
+							if (!string.IsNullOrEmpty (token)) {
+								string expression = token.Trim ();
 
-							foreach (string tc in targetsClasses) {
-								if (!iface.Styling.ContainsKey (tc))
-									iface.Styling [tc] = new Dictionary<string, string> ();
-								else if (iface.Styling [tc].ContainsKey (currentProperty))
-									continue;
-								iface.Styling [tc] [currentProperty] = expression;
+								foreach (string tc in targetsClasses) {
+									if (!iface.Styling.ContainsKey (tc))
+										iface.Styling [tc] = new Dictionary<string, string> ();
+									else if (iface.Styling [tc].ContainsKey (currentProperty))
+										continue;
+									iface.Styling [tc] [currentProperty] = expression;
+								}
+								token = "";
 							}
-							token = "";
-						}
-						state = readerState.propertyName;
-					} else
+							state = readerState.propertyName;
+						} else
+							token += c;
+					} else {
+						if (c == '{')
+							curlyBracketCount++;
+						else if (c == '}')
+							curlyBracketCount--;
 						token += c;
+					}
 					break;
 				}
-			}					
+			}
+
+			if (curlyBracketCount > 0)
+				throw new Exception ("Unexpected end of file");
 		}
 	}
 }
-- 
cgit v1.3.1-4-g156e


From dfe1b846ad7fbcaad07f9083a0e1773ba0bcffbd Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 30 Jul 2016 19:45:38 +0200
Subject: change style values from string to object to be able to store
 dynMehods 	modifié :         src/CompilerServices/CompilerServices.cs 
 modifié :         src/GraphicObjects/GraphicObject.cs 	modifié :        
 src/Interface.cs 	modifié :         src/StyleReader.cs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/CompilerServices/CompilerServices.cs | 1 +
 src/GraphicObjects/GraphicObject.cs      | 2 +-
 src/Interface.cs                         | 4 ++--
 src/StyleReader.cs                       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/Interface.cs')

diff --git a/src/CompilerServices/CompilerServices.cs b/src/CompilerServices/CompilerServices.cs
index 1fff4e7d..4a85c442 100644
--- a/src/CompilerServices/CompilerServices.cs
+++ b/src/CompilerServices/CompilerServices.cs
@@ -56,6 +56,7 @@ namespace Crow
 				if (!b.FindTarget ())
 					continue;
 
+				//group Bindings by target instanceq
 				List<Binding> bindings = null;
 				if (!resolved.TryGetValue (b.Target.Instance, out bindings)) {
 					bindings = new List<Binding> ();
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 1863dccd..a24b5763 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -509,7 +509,7 @@ namespace Crow
 				return;
 			}
 
-			List<Dictionary<string, string>> styling = new List<Dictionary<string, string>>();
+			List<Dictionary<string, object>> styling = new List<Dictionary<string, object>>();
 
 			//Search for a style mathing :
 			//1: Full class name, with full namespace
diff --git a/src/Interface.cs b/src/Interface.cs
index b8b06918..a83a5305 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -90,7 +90,7 @@ namespace Crow
 
 		public Queue<LayoutingQueueItem> LayoutingQueue = new Queue<LayoutingQueueItem> ();
 		public Queue<GraphicObject> GraphicUpdateQueue = new Queue<GraphicObject>();
-		public Dictionary<string, Dictionary<string, string>> Styling;
+		public Dictionary<string, Dictionary<string, object>> Styling;
 		public string Clipboard;
 		public static void RegisterForGraphicUpdate(GraphicObject g)
 		{
@@ -269,7 +269,7 @@ namespace Crow
 			System.Globalization.CultureInfo savedCulture = Thread.CurrentThread.CurrentCulture;
 			Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
 
-			Styling = new Dictionary<string, Dictionary<string, string>> ();
+			Styling = new Dictionary<string, Dictionary<string, object>> ();
 
 			//fetch styling info in this order, if member styling is alreadey referenced in previous
 			//assembly, it's ignored.
diff --git a/src/StyleReader.cs b/src/StyleReader.cs
index 5060b3d9..0c4ce2bc 100644
--- a/src/StyleReader.cs
+++ b/src/StyleReader.cs
@@ -106,7 +106,7 @@ namespace Crow
 
 								foreach (string tc in targetsClasses) {
 									if (!iface.Styling.ContainsKey (tc))
-										iface.Styling [tc] = new Dictionary<string, string> ();
+										iface.Styling [tc] = new Dictionary<string, object> ();
 									else if (iface.Styling [tc].ContainsKey (currentProperty))
 										continue;
 									iface.Styling [tc] [currentProperty] = expression;
-- 
cgit v1.3.1-4-g156e


From a508dabb5edb41304143bc135ad769d63164d026 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sun, 31 Jul 2016 12:02:14 +0200
Subject: Style attribute in xml, add default value loader style key. 
 modifié :         src/GraphicObjects/GraphicObject.cs 	modifié :        
 src/Interface.cs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GraphicObjects/GraphicObject.cs | 80 ++++++++++++++++++++++---------------
 src/Interface.cs                    | 14 ++-----
 2 files changed, 52 insertions(+), 42 deletions(-)

(limited to 'src/Interface.cs')

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index a24b5763..a053e700 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -45,17 +45,14 @@ namespace Crow
 			uid = currentUid;
 			currentUid++;
 
-			if (Interface.XmlSerializerInit)
+			if (Interface.CurrentInterface.XmlLoading)
 				return;
-
-			loadDefaultValues ();
 		}
 		public GraphicObject (Rectangle _bounds)
 		{
-			if (Interface.XmlSerializerInit)
-				return;
-
-			loadDefaultValues ();
+			if (!Interface.CurrentInterface.XmlLoading)
+				loadDefaultValues ();
+			
 			Left = _bounds.Left;
 			Top = _bounds.Top;
 			Width = _bounds.Width;
@@ -485,17 +482,6 @@ namespace Crow
 		}
 		#endregion
 
-
-		/// <summary>
-		/// Add 'Styles' to full class name between assembly name and the rest of the full name space
-		/// </summary>
-		string getDefaultStyleResId (Type t) {
-			string [] tmp = t.FullName.Split ('.');
-			string res = tmp [0] + ".Styles";
-			for (int i = 1; i < tmp.Length; i++)
-				res += "." + tmp [i];
-			return res;
-		}
 		/// <summary> Loads the default values from XML attributes default </summary>
 		protected virtual void loadDefaultValues()
 		{
@@ -504,10 +490,21 @@ namespace Crow
 			#endif
 
 			Type thisType = this.GetType ();
+
+			if (!string.IsNullOrEmpty (Style)) {
+				if (Interface.DefaultValuesLoader.ContainsKey (Style)) {
+					Interface.DefaultValuesLoader [Style] (this);
+					return;
+				}
+			}
 			if (Interface.DefaultValuesLoader.ContainsKey (thisType.FullName)) {
 				Interface.DefaultValuesLoader [thisType.FullName] (this);
 				return;
 			}
+			if (Interface.DefaultValuesLoader.ContainsKey (thisType.Name)) {
+				Interface.DefaultValuesLoader [thisType.Name] (this);
+				return;
+			}
 
 			List<Dictionary<string, object>> styling = new List<Dictionary<string, object>>();
 
@@ -516,15 +513,26 @@ namespace Crow
 			//2: class name
 			//3: style may have been registered with their ressource ID minus .style extention
 			//   those files being placed in a Styles folder
-
-			if (Interface.CurrentInterface.Styling.ContainsKey (thisType.FullName))
+			string styleKey = Style;
+			if (!string.IsNullOrEmpty (Style)) {
+				if (Interface.CurrentInterface.Styling.ContainsKey (Style)) {
+					styling.Add (Interface.CurrentInterface.Styling [Style]);
+				}
+			}
+			if (Interface.CurrentInterface.Styling.ContainsKey (thisType.FullName)) {
 				styling.Add (Interface.CurrentInterface.Styling [thisType.FullName]);
-			if (Interface.CurrentInterface.Styling.ContainsKey (thisType.Name))
+				if (string.IsNullOrEmpty (styleKey))
+					styleKey = thisType.FullName;
+			}
+			if (Interface.CurrentInterface.Styling.ContainsKey (thisType.Name)) {
 				styling.Add (Interface.CurrentInterface.Styling [thisType.Name]);
-			
-			string styleFullName = getDefaultStyleResId (thisType);
-			if (Interface.CurrentInterface.Styling.ContainsKey (styleFullName))
-				styling.Add (Interface.CurrentInterface.Styling [styleFullName]);
+				if (string.IsNullOrEmpty (styleKey))
+					styleKey = thisType.Name;
+			}
+
+			if (string.IsNullOrEmpty (styleKey))
+				styleKey = thisType.FullName;
+
 			
 			//Reflexion being very slow compared to dyn method or delegates,
 			//I compile the initial values coded in the CustomAttribs of the class,
@@ -676,8 +684,8 @@ namespace Crow
 			il.Emit(OpCodes.Ret);
 			#endregion
 
-			Interface.DefaultValuesLoader[thisType.FullName] = (Interface.loadDefaultInvoker)dm.CreateDelegate(typeof(Interface.loadDefaultInvoker));
-			Interface.DefaultValuesLoader[thisType.FullName] (this);
+			Interface.DefaultValuesLoader[styleKey] = (Interface.loadDefaultInvoker)dm.CreateDelegate(typeof(Interface.loadDefaultInvoker));
+			Interface.DefaultValuesLoader[styleKey] (this);
 		}
 
 		public virtual GraphicObject FindByName(string nameToFind){
@@ -1283,13 +1291,21 @@ namespace Crow
 		}
 		public virtual void ReadXml (System.Xml.XmlReader reader)
 		{
-			if (!reader.HasAttributes)
-				return;
+			if (reader.HasAttributes) {				
+
+				style = reader.GetAttribute ("Style");
 
-			while (reader.MoveToNextAttribute ())
-				affectMember (reader.Name, reader.Value);
+				loadDefaultValues ();
 
-			reader.MoveToElement();
+				while (reader.MoveToNextAttribute ()) {
+					if (reader.Name == "Style")
+						continue;
+
+					affectMember (reader.Name, reader.Value);
+				}
+				reader.MoveToElement ();
+			}else
+				loadDefaultValues ();
 		}
 		public virtual void WriteXml (System.Xml.XmlWriter writer)
 		{
diff --git a/src/Interface.cs b/src/Interface.cs
index a83a5305..f67849a7 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -59,8 +59,7 @@ namespace Crow
 		#endregion
 
 		#region Static and constants
-		/// <summary> Used to prevent spurious loading of templates </summary>
-		internal static bool XmlSerializerInit = false;
+		internal bool XmlLoading = false;
 		/// <summary> keep ressource path for debug msg </summary>
 		internal static string CurrentGOMLPath = "";
 		//used in templatedControl
@@ -216,7 +215,7 @@ namespace Crow
 
 			return tmp;
 		}
-		public static GraphicObject Load (Stream stream, Type type, object hostClass = null)
+		internal static GraphicObject Load (Stream stream, Type type, object hostClass = null)
 		{
 			#if DEBUG_LOAD
 			Stopwatch loadingTime = new Stopwatch ();
@@ -225,16 +224,16 @@ namespace Crow
 
 			GraphicObject result;
 
+			CurrentInterface.XmlLoading = true;
 
 			XmlSerializerNamespaces xn = new XmlSerializerNamespaces ();
 			xn.Add ("", "");
 
-			XmlSerializerInit = true;
 			XmlSerializer xs = new XmlSerializer (type);
-			XmlSerializerInit = false;
 
 			result = (GraphicObject)xs.Deserialize (stream);
 			//result.DataSource = hostClass;
+			CurrentInterface.XmlLoading = false;
 
 			#if DEBUG_LOAD
 			FileStream fs = stream as FileStream;
@@ -250,11 +249,6 @@ namespace Crow
 			return result;
 		}
 
-		public void InterfaceLoad(string path){
-			GraphicObject tmp = Interface.Load (path, this);
-			AddWidget (tmp);
-		}
-
 		public GraphicObject LoadInterface (string path)
 		{
 			lock (UpdateMutex) {
-- 
cgit v1.3.1-4-g156e