diff options
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverControl.cs | 8 | ||||
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs | 8 | ||||
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Resources/custom-expression-32.png | bin | 0 -> 361 bytes | |||
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Resources/custom-expression-32@2x.png | bin | 0 -> 691 bytes | |||
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Resources/custom-expression-32~dark.png | bin | 0 -> 357 bytes | |||
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Resources/custom-expression-32~dark@2x.png | bin | 0 -> 691 bytes | |||
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj | 4 | ||||
-rw-r--r-- | Xamarin.PropertyEditing/Properties/Resources.resx | 2 |
8 files changed, 14 insertions, 8 deletions
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverControl.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverControl.cs index ff851b0..203a11f 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverControl.cs @@ -6,7 +6,7 @@ namespace Xamarin.PropertyEditing.Mac { internal class BasePopOverControl : NSView { - const int DefaultIconButtonSize = 24; + const int DefaultIconButtonSize = 32; public BasePopOverControl (string title, string imageNamed) : base () { @@ -30,6 +30,7 @@ namespace Xamarin.PropertyEditing.Mac var viewTitle = new UnfocusableTextField () { StringValue = title, TranslatesAutoresizingMaskIntoConstraints = false, + Font = NSFont.BoldSystemFontOfSize(11) }; AddSubview (viewTitle); @@ -39,8 +40,9 @@ namespace Xamarin.PropertyEditing.Mac iconView.ConstraintTo (this, (iv, c) => iv.Left == c.Left + 5), iconView.ConstraintTo (this, (iv, c) => iv.Width == DefaultIconButtonSize), iconView.ConstraintTo (this, (iv, c) => iv.Height == DefaultIconButtonSize), - viewTitle.ConstraintTo (this, (vt, c) => vt.Top == c.Top + 6), - viewTitle.ConstraintTo (this, (vt, c) => vt.Left == c.Left + 30), + + viewTitle.ConstraintTo (this, (vt, c) => vt.Top == c.Top + 10), + viewTitle.ConstraintTo (this, (vt, c) => vt.Left == c.Left + 38), viewTitle.ConstraintTo (this, (vt, c) => vt.Width == 120), viewTitle.ConstraintTo (this, (vt, c) => vt.Height == 24), }); diff --git a/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs b/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs index 17be2bc..3c6942b 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs @@ -16,7 +16,7 @@ namespace Xamarin.PropertyEditing.Mac public CustomExpressionView (PropertyViewModel viewModel) : base (viewModel, Properties.Resources.CustomExpression, "custom-expression-32") { - Frame = new CGRect (CGPoint.Empty, new CGSize (250, 60)); + Frame = new CGRect (CGPoint.Empty, new CGSize (250, 80)); var customExpressionField = new NSTextField { StringValue = string.Empty, @@ -36,9 +36,9 @@ namespace Xamarin.PropertyEditing.Mac AddSubview (customExpressionField); this.DoConstraints (new[] { - customExpressionField.ConstraintTo (this, (s, c) => s.Top == c.Top + 30), - customExpressionField.ConstraintTo (this, (s, c) => s.Left == c.Left + 30), - customExpressionField.ConstraintTo (this, (s, c) => s.Width == c.Width - 37), + customExpressionField.ConstraintTo (this, (s, c) => s.Top == c.Top + 37), + customExpressionField.ConstraintTo (this, (s, c) => s.Left == c.Left + 38), + customExpressionField.ConstraintTo (this, (s, c) => s.Width == c.Width - 57), customExpressionField.ConstraintTo (this, (s, c) => s.Height == 24), }); } diff --git a/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32.png b/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32.png Binary files differnew file mode 100644 index 0000000..01b6e63 --- /dev/null +++ b/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32.png diff --git a/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32@2x.png b/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32@2x.png Binary files differnew file mode 100644 index 0000000..7f82243 --- /dev/null +++ b/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32@2x.png diff --git a/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32~dark.png b/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32~dark.png Binary files differnew file mode 100644 index 0000000..ad53c5b --- /dev/null +++ b/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32~dark.png diff --git a/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32~dark@2x.png b/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32~dark@2x.png Binary files differnew file mode 100644 index 0000000..3f34059 --- /dev/null +++ b/Xamarin.PropertyEditing.Mac/Resources/custom-expression-32~dark@2x.png diff --git a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj index 4cb237f..8f2c5d4 100644 --- a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj +++ b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj @@ -174,6 +174,10 @@ <BundleResource Include="Resources\property-button-local-mac-active-10%402x.png" />
<BundleResource Include="Resources\property-button-local-mac-active-10~dark.png" />
<BundleResource Include="Resources\property-button-local-mac-active-10~dark%402x.png" />
+ <BundleResource Include="Resources\custom-expression-32.png" />
+ <BundleResource Include="Resources\custom-expression-32%402x.png" />
+ <BundleResource Include="Resources\custom-expression-32~dark.png" />
+ <BundleResource Include="Resources\custom-expression-32~dark%402x.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
</Project>
diff --git a/Xamarin.PropertyEditing/Properties/Resources.resx b/Xamarin.PropertyEditing/Properties/Resources.resx index a6bd2c1..63eac2c 100644 --- a/Xamarin.PropertyEditing/Properties/Resources.resx +++ b/Xamarin.PropertyEditing/Properties/Resources.resx @@ -345,7 +345,7 @@ <value>Select Object</value> </data> <data name="CustomExpression" xml:space="preserve"> - <value>Custom expression</value> + <value>Custom Expression</value> </data> <data name="ColorEditorTabLabel" xml:space="preserve"> <value>Editor</value> |