diff options
author | Bret Johnson <bret.johnson@microsoft.com> | 2022-03-01 18:15:41 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-01 18:15:41 +0300 |
commit | 67538aec107829384f0d13e64bb669574ba14bb5 (patch) | |
tree | 3b61f95fe7d20b0937aa0bfb181ef82243839d0c /Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs | |
parent | 32e42632f42dba9fb38f326dcc4e14ca19f9568b (diff) | |
parent | 2ca79fd2bc386f01aacbe81119475c540863cb3e (diff) |
Merge pull request #796 from xamarin/backport-pr-792-to-main
[main] Reimplementation UpdateKeyViews() based in ProxyRowResponder
Diffstat (limited to 'Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs')
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs index f402bf7..77f6edb 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs @@ -74,8 +74,8 @@ namespace Xamarin.PropertyEditing.Mac } } - private NSComboBox comboBox; - private NSPopUpButton popupButton; + private FocusableComboBox comboBox; + private FocusablePopUpButton popupButton; private NSMenu popupButtonList; private NSView firstKeyView; @@ -113,8 +113,9 @@ namespace Xamarin.PropertyEditing.Mac Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small)), TranslatesAutoresizingMaskIntoConstraints = false, StringValue = String.Empty, + ProxyResponder = new ProxyResponder (this, ProxyRowType.SingleView) }; - + this.popupButton.ProxyResponder = new ProxyResponder (this, ProxyRowType.SingleView); this.popupButtonList = new NSMenu (); this.popupButton.Menu = this.popupButtonList; this.popupButton.Activated += PopupButton_Activated; @@ -155,12 +156,13 @@ namespace Xamarin.PropertyEditing.Mac LineBreakMode = NSLineBreakMode.TruncatingTail, UsesSingleLineMode = true, }, + ProxyResponder = new ProxyResponder (this, ProxyRowType.SingleView), ControlSize = NSControlSize.Small, Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small)), TranslatesAutoresizingMaskIntoConstraints = false, StringValue = String.Empty, }; - + this.comboBox.ProxyResponder = new ProxyResponder (this, ProxyRowType.SingleView); this.comboBox.SelectionChanged += ComboBox_SelectionChanged; AddSubview (this.comboBox); |