Merge pull request #1701 from cwensley/curtis/mac-fixes

Mac fixes and auto-load platform assemblies when subclassed
picoe · May 28, 2020 · a9e25d4 · a9e25d4
2 parents 780e081 + 20a4c07
commit a9e25d4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/src/Eto.Mac/Forms/MacWindow.cs b/src/Eto.Mac/Forms/MacWindow.cs
@@ -580,8 +580,14 @@ public override Size Size
 			set
 			{
 				var oldFrame = Control.Frame;
-				var newFrame = oldFrame.SetSize(value);
-				newFrame.Y = (nfloat)Math.Max(0, oldFrame.Y - (value.Height - oldFrame.Height));
+				var newFrame = oldFrame;
+				if (value.Width >= 0)
+					newFrame.Width = value.Width;
+				if (value.Height > 0)
+				{
+					newFrame.Height = value.Height;
+					newFrame.Y = (nfloat)Math.Max(0, oldFrame.Y - (value.Height - oldFrame.Height));
+				}
 				Control.SetFrame(newFrame, true);
 				UserPreferredSize = value;
 				SetAutoSize();

diff --git a/src/Eto.Mac/build/BundleDotNetCore.targets b/src/Eto.Mac/build/BundleDotNetCore.targets
@@ -63,7 +63,7 @@
   <Target Name="MacBuildAppBundleWithoutRuntime" AfterTargets="AfterBuild" Condition="$(MacBundleDotNet) != 'True' AND $(MacIsBuildingBundle) == 'True'" DependsOnTargets="MacInitializeBundle;MacCollectExecutableFiles">
 
     <!-- copy executable files -->
-    <Copy SourceFiles="@(MacExecutableFiles)" DestinationFiles="$(LauncherPath)%(MacExecutableFiles.TargetPath)" />
+    <Copy SourceFiles="@(MacExecutableFiles)" DestinationFiles="@(MacExecutableFiles->'$(LauncherPath)%(TargetPath)')" />
 
     <!-- finish building the bundle -->
     <CallTarget Targets="MacFinishBundle" />

diff --git a/src/Eto.Mac/build/BundleMono.targets b/src/Eto.Mac/build/BundleMono.targets
@@ -165,7 +165,7 @@
     </ItemGroup>
 
     <!-- copy executable files -->
-    <Copy SourceFiles="@(MacExecutableFiles)" DestinationFiles="$(OutputMonoBundlePath)%(MacExecutableFiles.TargetPath)" />
+    <Copy SourceFiles="@(MacExecutableFiles)" DestinationFiles="@(MacExecutableFiles->'$(OutputMonoBundlePath)%(TargetPath)')" />
   </Target>
 
 

diff --git a/src/Eto/Platform.cs b/src/Eto/Platform.cs
@@ -611,14 +611,24 @@ internal HandlerInfo FindHandler(Type type)
 				return info;
 
 			var handler = type.GetCustomAttribute<HandlerAttribute>(true);
-			Func<object> activator;
-			if (handler != null && instantiatorMap.TryGetValue(handler.Type, out activator))
+			if (handler != null)
 			{
-				var autoInit = handler.Type.GetCustomAttribute<AutoInitializeAttribute>(true);
-				info = new HandlerInfo(autoInit == null || autoInit.Initialize, activator);
-				handlerMap.Add(type, info);
-				return info;
+				if (instantiatorMap.TryGetValue(handler.Type, out var activator))
+				{
+					var autoInit = handler.Type.GetCustomAttribute<AutoInitializeAttribute>(true);
+					info = new HandlerInfo(autoInit == null || autoInit.Initialize, activator);
+					handlerMap.Add(type, info);
+					return info;
+				}
+				// load the assembly of the handler type (needed when type is a subclass)
+				if (!loadedAssemblies.Contains(handler.Type.GetAssembly()))
+				{
+					LoadAssembly(handler.Type.GetAssembly());
+					return FindHandler(type);
+				}
 			}
+
+			// load the assembly of the target type (can be a subclass)
 			if (!loadedAssemblies.Contains(type.GetAssembly()))
 			{
 				LoadAssembly(type.GetAssembly());