Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/xamarin/Xamarin.PropertyEditing.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Maupin <me@ermau.com>2019-03-20 22:10:40 +0300
committerGitHub <noreply@github.com>2019-03-20 22:10:40 +0300
commit1f8172c46329c4af3e03b9d2334cf6ea0d21ef64 (patch)
tree20395ef235429258db4f46d75a37b022ecfb7b50
parent716fa16750d95096febde00b094cc68d33df9ad2 (diff)
[mac] Fix visibility and layout for TimeSpantimespan-editor
-rw-r--r--Xamarin.PropertyEditing.Mac/Controls/Custom/TimeSpanTextField.cs5
-rw-r--r--Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs8
2 files changed, 7 insertions, 6 deletions
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/TimeSpanTextField.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/TimeSpanTextField.cs
index cf99a3c..77e0114 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/TimeSpanTextField.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/TimeSpanTextField.cs
@@ -4,7 +4,7 @@ using Foundation;
namespace Xamarin.PropertyEditing.Mac
{
- public class TimeSpanTextField : NSTextField
+ internal class TimeSpanTextField : NSTextField
{
string cachedValueString;
NSText cachedCurrentEditor;
@@ -17,6 +17,7 @@ namespace Xamarin.PropertyEditing.Mac
{
BackgroundColor = NSColor.Clear;
ControlSize = NSControlSize.Small;
+ Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small));
StringValue = string.Empty;
TranslatesAutoresizingMaskIntoConstraints = false;
}
@@ -40,7 +41,7 @@ namespace Xamarin.PropertyEditing.Mac
}
}
- public class TimeSpanValidationDelegate : NSTextViewDelegate
+ internal class TimeSpanValidationDelegate : NSTextViewDelegate
{
readonly TimeSpanTextField textField;
diff --git a/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs
index d993abe..9133fa3 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/TimeSpanEditorControl.cs
@@ -23,9 +23,9 @@ namespace Xamarin.PropertyEditing.Mac
AddSubview (this.editor);
this.AddConstraints (new[] {
- NSLayoutConstraint.Create (this.editor, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, 1f),
- NSLayoutConstraint.Create (this.editor, NSLayoutAttribute.Width, NSLayoutRelation.Equal, this, NSLayoutAttribute.Width, 1f, -34f),
- NSLayoutConstraint.Create (this.editor, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1f, DefaultControlHeight - 3),
+ NSLayoutConstraint.Create (this.editor, NSLayoutAttribute.CenterY, NSLayoutRelation.Equal, this, NSLayoutAttribute.CenterY, 1f, 0f),
+ NSLayoutConstraint.Create (this.editor, NSLayoutAttribute.Width, NSLayoutRelation.Equal, this, NSLayoutAttribute.Width, 1f, 0f),
+ NSLayoutConstraint.Create (this.editor, NSLayoutAttribute.Height, NSLayoutRelation.Equal, this, NSLayoutAttribute.Height, 1f, -6),
});
}
@@ -54,7 +54,7 @@ namespace Xamarin.PropertyEditing.Mac
protected override void SetEnabled ()
{
- this.editor.Editable = ViewModel.Property.CanWrite;
+ this.editor.Enabled = ViewModel.Property.CanWrite;
}
protected override void UpdateAccessibilityValues ()