From e732b84972c7fc5dd224fc9920abdd111377d3f4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Tue, 2 Feb 2021 20:18:53 +0100
Subject: [PATCH] unbox value type in emitGetSubData, FileDialog enabled for
 folder only, minimum size for Button in style and no longer in template root
 group

---
 Crow/Default.style                         |  1 +
 Crow/Templates/Button.template             |  2 +-
 Crow/Templates/FileDialog.template         |  2 +-
 Crow/src/Command.cs                        |  1 +
 Crow/src/Interface.cs                      | 56 +++++++++++++++++-----
 Crow/src/ItemTemplate.cs                   |  4 +-
 Crow/src/Widgets/FileDialog.cs             | 25 ++++++----
 Samples/DebugLogAnalyzer/DbgLogViewer.cs   |  4 +-
 Samples/common/ui/Interfaces/Divers/0.crow | 12 ++---
 9 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/Crow/Default.style b/Crow/Default.style
index b99680b1..db754c1b 100644
--- a/Crow/Default.style
+++ b/Crow/Default.style
@@ -67,6 +67,7 @@ Wrapper {
 }
 Button {
 	Caption = "Button";
+	MinimumSize = "50,20";
 	Width = "Fit";
 }
 Label {
diff --git a/Crow/Templates/Button.template b/Crow/Templates/Button.template
index 14b14a2f..c46da8c6 100644
--- a/Crow/Templates/Button.template
+++ b/Crow/Templates/Button.template
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Border Background="{./Background}" MinimumSize="50,20" Name="Content"
+<Border Background="{./Background}" Name="Content"
 	Foreground="Transparent" CornerRadius="{../CornerRadius}" BorderWidth="1"
 	MouseEnter="{Foreground=vgradient|0:White|0.2:Grey|0.9:Grey|1:Black};{caption.Foreground=White}"
 	MouseLeave="{Foreground=Transparent};{caption.Foreground=LightGrey}"
diff --git a/Crow/Templates/FileDialog.template b/Crow/Templates/FileDialog.template
index 5140aae7..3967d9d8 100644
--- a/Crow/Templates/FileDialog.template
+++ b/Crow/Templates/FileDialog.template
@@ -22,7 +22,7 @@
 					<TextBox Style="TxtInFileDialog" Text="{²./CurrentDirectory}"/>
 				</HorizontalStack>
 				<DirectoryView ShowHidden="{²../cbShowHidden.IsChecked}" FileMask="{²../txtFileMask.Text}" ShowFiles="{²../cbShowFiles.IsChecked}" Name="fv" CurrentDirectory="{./CurrentDirectory}" SelectedItemChanged="./onFVSelectedItemChanged"
-						Width="100%" Margin="0" MouseDoubleClick="./onFileSelect">
+						Width="100%" Margin="0" MouseDoubleClick="./onFileSelectDblClick">
 					<Template>
 						<ListBox ItemTemplate="#Crow.FileItems.template" Name="fileView" Data="{./FileSystemEntries}"
 							SelectedItemChanged="./onSelectedItemChanged">
diff --git a/Crow/src/Command.cs b/Crow/src/Command.cs
index caa8a3b0..a068224e 100644
--- a/Crow/src/Command.cs
+++ b/Crow/src/Command.cs
@@ -59,6 +59,7 @@ namespace Crow {
 		#endregion
 
 		#region CTOR
+		public Command () {}
 		/// <summary>
 		/// Initializes a new instance of Command with the action pass as argument.
 		/// </summary>
diff --git a/Crow/src/Interface.cs b/Crow/src/Interface.cs
index 12df8553..d22c58e9 100644
--- a/Crow/src/Interface.cs
+++ b/Crow/src/Interface.cs
@@ -70,25 +70,31 @@ namespace Crow
 			if (!Directory.Exists (CROW_CONFIG_ROOT))
 				Directory.CreateDirectory (CROW_CONFIG_ROOT);
 
-			//ensure all assemblies are loaded, because IML could contains classes not instanciated in source
-			foreach (string af in Directory.GetFiles (AppDomain.CurrentDomain.BaseDirectory, "*.dll")) {
-				try {
-					Assembly a =Assembly.LoadFrom (af);
-					if (a == Assembly.GetEntryAssembly () || a == Assembly.GetExecutingAssembly ())
-						continue;
-					if (a.GetCustomAttribute (typeof (CrowAttribute)) != null) 
-						crowAssemblies.Add (a);
-				} catch {
-					Debug.WriteLine ("{0} not loaded as assembly.", af);
-				}
-			}
-
 			FontRenderingOptions = new FontOptions ();
 			FontRenderingOptions.Antialias = Antialias.Subpixel;
 			FontRenderingOptions.HintMetrics = HintMetrics.On;
 			FontRenderingOptions.HintStyle = HintStyle.Full;
 			FontRenderingOptions.SubpixelOrder = SubpixelOrder.Default;
+
+			preloadCrowAssemblies ();
 		}
+		static void preloadCrowAssemblies () {
+			//ensure all assemblies are loaded, because IML could contains classes not instanciated in source
+			Assembly ea = Assembly.GetEntryAssembly ();
+			System.IO.FileStream[] files = ea.GetFiles ();
+			foreach (AssemblyName an in ea.GetReferencedAssemblies()) {
+				try {
+					Assembly a = Assembly.ReflectionOnlyLoad (an.Name);
+					if (a == Assembly.GetExecutingAssembly ())
+							continue;
+					if (a.GetCustomAttribute (typeof (CrowAttribute)) != null)
+							crowAssemblies.Add (a);
+				} catch {
+
+				}											
+			}
+		}
+
 		public Interface (int width, int height, IntPtr glfwWindowHandle) : this (width, height, false, false)
 		{
 			hWin = glfwWindowHandle;
@@ -172,6 +178,30 @@ namespace Crow
 				throw new PlatformNotSupportedException ("Unable to create cairo surface.");
 			}
 		}
+		internal Dictionary<string, MethodInfo> knownExtMethods = new Dictionary<string, MethodInfo> ();
+		internal MethodInfo SearchExtMethod (Type t, string methodName) {
+			string key = t.Name + "." + methodName;
+			if (knownExtMethods.ContainsKey (key))
+				return knownExtMethods [key];
+
+			//System.Diagnostics.Debug.WriteLine ($"*** search extension method: {t};{methodName} => key={key}");
+
+			MethodInfo mi = null;
+			if (!CompilerServices.TryGetExtensionMethods (Assembly.GetEntryAssembly (), t, methodName, out mi)) {
+				if (!CompilerServices.TryGetExtensionMethods (t.Module.Assembly, t, methodName, out mi)) {
+					foreach (Assembly a in crowAssemblies) {
+						if (CompilerServices.TryGetExtensionMethods (a, t, methodName, out mi))
+							break;
+					}
+					if (mi == null)
+						CompilerServices.TryGetExtensionMethods (Assembly.GetExecutingAssembly (), t, methodName, out mi);//crow Assembly
+				}
+			}
+
+			//add key even if mi is null to prevent searching again and again for propertyless bindings
+			knownExtMethods.Add (key, mi);
+			return mi;
+		}
 
 		#region events delegates
 
diff --git a/Crow/src/ItemTemplate.cs b/Crow/src/ItemTemplate.cs
index e1696256..cf182b42 100644
--- a/Crow/src/ItemTemplate.cs
+++ b/Crow/src/ItemTemplate.cs
@@ -228,9 +228,11 @@ namespace Crow
 		}
 		//data is on the stack
 		void emitGetSubData(ILGenerator il, Type dataType){
+			if (dataType.IsValueType)
+				il.Emit (OpCodes.Unbox_Any, dataType);
 			MethodInfo miGetDatas = dataType.GetMethod (fetchMethodName, new Type[] {});
 			if (miGetDatas == null)
-				miGetDatas = CompilerServices.SearchExtMethod (dataType, fetchMethodName);
+				miGetDatas = iface.SearchExtMethod (dataType, fetchMethodName);
 
 			if (miGetDatas == null) {//in last resort, search among properties
 				PropertyInfo piDatas = dataType.GetProperty (fetchMethodName);
diff --git a/Crow/src/Widgets/FileDialog.cs b/Crow/src/Widgets/FileDialog.cs
index 1a7ec842..bc6b46c0 100644
--- a/Crow/src/Widgets/FileDialog.cs
+++ b/Crow/src/Widgets/FileDialog.cs
@@ -106,19 +106,24 @@ namespace Crow
 				SelectedDirectory = e.NewValue.ToString();
 		}
 		public void goUpDirClick (object sender, MouseButtonEventArgs e){
-			string root = Directory.GetDirectoryRoot(CurrentDirectory);			
-			DirectoryInfo parentDir = Directory.GetParent (CurrentDirectory);
-			if (parentDir == null)
+			string root = Directory.GetDirectoryRoot(CurrentDirectory);
+			if (CurrentDirectory == root)
 				return;
-			CurrentDirectory = parentDir.FullName;
+			CurrentDirectory = Directory.GetParent(CurrentDirectory).FullName;
 		}
-		void onFileSelect(object sender, MouseButtonEventArgs e){
-			if (string.IsNullOrEmpty (SelectedFile))
-				CurrentDirectory = SelectedDirectory;
-			else {
-				OkClicked.Raise (this, null);
-				IFace.DeleteWidget (this);
+		void onFileSelectDblClick (object sender, MouseButtonEventArgs e) {
+			CurrentDirectory = SelectedDirectory;
+		}
+
+		void onFileSelect (object sender, MouseButtonEventArgs e){
+			if (ShowFiles) {
+				if (string.IsNullOrEmpty (SelectedFile)) {
+					CurrentDirectory = SelectedDirectory;
+					return;
+				} 									
 			}
+			OkClicked.Raise (this, null);
+			IFace.DeleteWidget (this);
 		}
 		void onCancel(object sender, MouseButtonEventArgs e){
 			IFace.DeleteWidget (this);
diff --git a/Samples/DebugLogAnalyzer/DbgLogViewer.cs b/Samples/DebugLogAnalyzer/DbgLogViewer.cs
index 0d6bdfa9..49facb5a 100644
--- a/Samples/DebugLogAnalyzer/DbgLogViewer.cs
+++ b/Samples/DebugLogAnalyzer/DbgLogViewer.cs
@@ -364,9 +364,9 @@ namespace Crow
 			}*/
 
 		}
-		public override void Paint (ref Cairo.Context ctx)
+		public override void Paint (Cairo.Context ctx)
 		{
-			base.Paint (ref ctx);
+			base.Paint (ctx);
 
 			Rectangle r = new Rectangle(mousePos.X, 0, 1, Slot.Height);
 			Rectangle ctxR = ContextCoordinates (r);
diff --git a/Samples/common/ui/Interfaces/Divers/0.crow b/Samples/common/ui/Interfaces/Divers/0.crow
index ea526157..adc13fd8 100644
--- a/Samples/common/ui/Interfaces/Divers/0.crow
+++ b/Samples/common/ui/Interfaces/Divers/0.crow
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Window Caption="Showcase" Height="90%" Width="90%" Background="Jet">
+<?xml version="1.0" encoding="UTF-8"?>
+<Window Caption="Showcase" Height="90%" Width="90%" Background="DarkGrey">
 	<HorizontalStack>
 		<VerticalStack Width="30%" Margin="5">
 			<GroupBox Caption="Performance" Height="Fit">
@@ -52,10 +52,10 @@
 					</VerticalStack>
 					<Splitter />
 					<VerticalStack Width="50%">
-						<RadioButton Style="CheckBox2" />
-						<RadioButton Style="CheckBox2" />
-						<RadioButton Style="CheckBox2" />
-						<RadioButton Style="CheckBox2" />
+						<RadioButton Style="CheckBox2" Caption="RadioButton"/>
+						<RadioButton Style="CheckBox2" Caption="RadioButton"/>
+						<RadioButton Style="CheckBox2" Caption="RadioButton"/>
+						<RadioButton Style="CheckBox2" Caption="RadioButton"/>
 					</VerticalStack>
 				</HorizontalStack>
 			</GroupBox>
-- 
2.47.3