Merge pull request #4 from picoe/develop

Update to fix NumericUpDown sizing
picoe · Nov 18, 2014 · aa9f8e2 · aa9f8e2
2 parents be7411b + 8c858b1
commit aa9f8e2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/Resources/Publish.targets b/Resources/Publish.targets
@@ -139,6 +139,8 @@
     	<MSBuild Projects="$(XamarinStudioAddinProject)" Targets="RestorePackages" Properties="Configuration=$(Configuration)" Condition="$(Platform) == 'Windows'" />
     	<MSBuild Projects="$(XamarinStudioAddinProject)" Targets="Build" Properties="Configuration=$(Configuration)" Condition="$(Platform) == 'Windows'" />
 
+    	<Exec Command="$(mdtool) setup pack $(BaseDir)/BuildOutput/Addins/$(Configuration)/XamarinStudio/Eto.Addin.XamarinStudio.dll -d:$(BaseDir)/BuildOutput/Addins/$(Configuration)" Condition="$(Platform) != 'Windows'"/>
+
 		<!-- Visual Studio Addin -->
     	<MSBuild Projects="$(VisualStudioAddinProject)" Targets="Build" Properties="Configuration=$(Configuration)" Condition="$(Platform) == 'Windows'" />
     </Target>

diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Properties/AddinInfo.cs b/Source/Addins/Eto.Addin.XamarinStudio/Properties/AddinInfo.cs
@@ -3,8 +3,8 @@
 using Mono.Addins.Description;
 
 [assembly:Addin(
-	"Eto.Addin.XamarinStudio", 
-	Namespace = "Eto.Addin.XamarinStudio",
+	"XamarinStudio", 
+	Namespace = "Eto.Addin",
 	Version = "1.0"
 )]
 

diff --git a/Source/Addins/Eto.Addin.XamarinStudio/Properties/Manifest.addin.xml b/Source/Addins/Eto.Addin.XamarinStudio/Properties/Manifest.addin.xml
@@ -9,6 +9,9 @@
 		<Import file="Templates/Files/Eto-Form.xft.xml" />
 		<Import file="Templates/Files/Eto-Dialog.xft.xml" />
 		<Import file="Templates/Files/Eto-Panel.xft.xml" />
+		<Import file="Templates/Projects/Shared/MainForm.cs" />
+		<Import file="Templates/Projects/Shared/MyPanel.cs" />
+		<Import file="Templates/Projects/Mac/Info.plist" />
 	</Runtime>
 	<Extension path="/MonoDevelop/Ide/ProjectTemplatePackageRepositories">
 		<PackageRepository path="Packages" />

diff --git a/Source/Eto.WinForms/Forms/WindowHandler.cs b/Source/Eto.WinForms/Forms/WindowHandler.cs
@@ -67,6 +67,17 @@ public override Size ClientSize
 			}
 		}
 
+		protected override bool SetMinimumSize(Size size)
+		{
+			var sdsize = size.ToSD();
+			if (Control.MinimumSize != sdsize)
+			{
+				Control.MinimumSize = sdsize;
+				return true;
+			}
+			return false;
+		}
+
 		protected override void Initialize()
 		{
 			Control.KeyPreview = !ApplicationHandler.BubbleKeyEvents;
@@ -103,7 +114,7 @@ protected override void Initialize()
 					ContainerContentControl.MinimumSize = Content.GetPreferredSize().ToSD();
 				Control.MinimumSize = Control.Size;
 				Control.AutoSize = false;
-				Control.MinimumSize = sd.Size.Empty;
+				Control.MinimumSize = MinimumSize.ToSD();
 				content.MinimumSize = content.MaximumSize = sd.Size.Empty;
 				ContainerContentControl.MinimumSize = sd.Size.Empty;
 			};

diff --git a/Source/Eto.Wpf/Forms/Controls/NumericUpDownHandler.cs b/Source/Eto.Wpf/Forms/Controls/NumericUpDownHandler.cs
@@ -16,7 +16,6 @@ protected override sw.Size MeasureOverride(sw.Size constraint)
 				if (IsLoaded && IsVisible)
 				{
 					constraint.Width = !double.IsNaN(constraint.Width) ? Math.Min(constraint.Width, ActualWidth) : ActualWidth;
-					constraint.Height = !double.IsNaN(constraint.Height) ? Math.Min(constraint.Height, ActualHeight) : ActualHeight;
 				}
 				return base.MeasureOverride(constraint);
 			}

diff --git a/Source/Eto.Wpf/Forms/Controls/TextBoxHandler.cs b/Source/Eto.Wpf/Forms/Controls/TextBoxHandler.cs
@@ -19,7 +19,6 @@ protected override sw.Size MeasureOverride(sw.Size constraint)
 				if (IsLoaded && IsVisible)
 				{
 					constraint.Width = !double.IsNaN(constraint.Width) ? Math.Min(constraint.Width, ActualWidth) : ActualWidth;
-					constraint.Height = !double.IsNaN(constraint.Height) ? Math.Min(constraint.Height, ActualHeight) : ActualHeight;
 				}
 				return base.MeasureOverride(constraint);
 			}