diff options
author | Eric Maupin <me@ermau.com> | 2019-01-30 23:24:31 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-30 23:24:31 +0300 |
commit | 6585cc34dd23ef5777ea18a19a09dddcd2455a55 (patch) | |
tree | 0a73518eaee9f8265718939b34aa41b62f0d59ca /Xamarin.PropertyEditing.Mac | |
parent | 012003860469b22a814c89aec3de966c582fa292 (diff) | |
parent | e5345bb6234617d8070f48376262226ea3af0e6e (diff) |
Merge pull request #502 from xamarin/focusable-combobox
[Mac] Creates a new focusable ComboBox with readonly modifier
Diffstat (limited to 'Xamarin.PropertyEditing.Mac')
3 files changed, 34 insertions, 2 deletions
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableComboBox.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableComboBox.cs new file mode 100644 index 0000000..401c2ce --- /dev/null +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/FocusableComboBox.cs @@ -0,0 +1,32 @@ +using Foundation; +using AppKit; + +namespace Xamarin.PropertyEditing.Mac +{ + class FocusableComboBox : NSComboBox + { + public override bool ShouldBeginEditing (NSText textObject) + { + textObject.Delegate = new FocusableComboBoxDelegate (); + return false; + } + + public override void DidBeginEditing (NSNotification notification) + { + base.DidBeginEditing (notification); + } + + class FocusableComboBoxDelegate : NSTextDelegate + { + public override bool TextShouldEndEditing (NSText textObject) + { + return false; + } + + public override bool TextShouldBeginEditing (NSText textObject) + { + return false; + } + } + } +}
\ No newline at end of file diff --git a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs index d2e8ae8..cc7b4b0 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs @@ -20,12 +20,11 @@ namespace Xamarin.PropertyEditing.Mac { base.TranslatesAutoresizingMaskIntoConstraints = false; - this.comboBox = new NSComboBox { + this.comboBox = new FocusableComboBox { TranslatesAutoresizingMaskIntoConstraints = false, BackgroundColor = NSColor.Clear, StringValue = String.Empty, ControlSize = NSControlSize.Small, - Editable = false, Font = NSFont.FromFontName(DefaultFontName, DefaultFontSize), }; diff --git a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj index 35fb605..1e4aa71 100644 --- a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj +++ b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj @@ -144,6 +144,7 @@ <Compile Include="HostResourceProvider.cs" />
<Compile Include="Controls\Custom\DynamicFillBox.cs" />
<Compile Include="Controls\Custom\TabButton.cs" />
+ <Compile Include="Controls\Custom\FocusableComboBox.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Controls\" />
|