Skip to content
This repository was archived by the owner on Sep 25, 2024. It is now read-only.

Commit 774fc34

Browse files
Dominique LouisCartBlanche
Dominique Louis
authored and
CartBlanche
committed
[Mac] Initial Variations Implementation
1 parent 50cbb49 commit 774fc34

18 files changed

+422
-72
lines changed

‎Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverViewModelControl.cs

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using AppKit;
45
using Xamarin.PropertyEditing.ViewModels;
56

67
namespace Xamarin.PropertyEditing.Mac
@@ -9,6 +10,8 @@ internal class BasePopOverViewModelControl : BasePopOverControl
910
{
1011
internal PropertyViewModel ViewModel { get; }
1112

13+
public AutoClosePopOver PopOver { get; internal set; }
14+
1215
public BasePopOverViewModelControl (IHostResourceProvider hostResources, PropertyViewModel viewModel, string title, string imageNamed)
1316
: base (hostResources, title, imageNamed)
1417
{

‎Xamarin.PropertyEditing.Mac/Controls/Custom/CommandButton.cs

+28-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Windows.Input;
33
using AppKit;
44

5-
namespace Xamarin.PropertyEditing.Mac.Controls.Custom
5+
namespace Xamarin.PropertyEditing.Mac
66
{
77
internal class CommandButton : NSButton
88
{
@@ -34,7 +34,33 @@ public CommandButton ()
3434
private void CanExecuteChanged (object sender, EventArgs e)
3535
{
3636
if (sender is ICommand cmd)
37-
this.Enabled = cmd.CanExecute (null);
37+
Enabled = cmd.CanExecute (null);
38+
}
39+
}
40+
41+
internal class FocusableCommandButton : CommandButton
42+
{
43+
public override bool CanBecomeKeyView { get { return Enabled; } }
44+
45+
public FocusableCommandButton ()
46+
{
47+
AllowsExpansionToolTips = true;
48+
AllowsMixedState = true;
49+
Cell.LineBreakMode = NSLineBreakMode.TruncatingTail;
50+
Cell.UsesSingleLineMode = true;
51+
ControlSize = NSControlSize.Small;
52+
Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small));
53+
Title = string.Empty;
54+
TranslatesAutoresizingMaskIntoConstraints = false;
55+
}
56+
57+
public override bool BecomeFirstResponder ()
58+
{
59+
var willBecomeFirstResponder = base.BecomeFirstResponder ();
60+
if (willBecomeFirstResponder) {
61+
ScrollRectToVisible (Bounds);
62+
}
63+
return willBecomeFirstResponder;
3864
}
3965
}
4066
}

‎Xamarin.PropertyEditing.Mac/Controls/Custom/PropertyButton.cs

+51-33
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Threading.Tasks;
23
using AppKit;
34
using CoreGraphics;
45
using Xamarin.PropertyEditing.ViewModels;
@@ -19,11 +20,16 @@ internal PropertyViewModel ViewModel
1920
set {
2021
if (this.viewModel != null) {
2122
this.viewModel.PropertyChanged -= OnPropertyChanged;
23+
if (this.viewModel.HasVariations)
24+
this.viewModel.CreateVariantRequested -= OnCreateVariantRequested;
2225
}
2326

2427
this.viewModel = value;
2528
if (this.viewModel != null) {
2629
this.viewModel.PropertyChanged += OnPropertyChanged;
30+
if (this.viewModel.HasVariations)
31+
this.viewModel.CreateVariantRequested += OnCreateVariantRequested;
32+
2733
ValueSourceChanged (this.viewModel.ValueSource);
2834
}
2935
}
@@ -82,7 +88,7 @@ private void PopUpContextMenu ()
8288
AttributedTitle = new Foundation.NSAttributedString (
8389
Properties.Resources.CustomExpressionEllipsis,
8490
new CoreText.CTStringAttributes {
85-
Font = new CoreText.CTFont (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultFontSize + 1),
91+
Font = new CoreText.CTFont (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultMenuFontSize),
8692
})
8793
};
8894

@@ -99,7 +105,7 @@ private void PopUpContextMenu ()
99105
AttributedTitle = new Foundation.NSAttributedString (
100106
Properties.Resources.ResourceEllipsis,
101107
new CoreText.CTStringAttributes {
102-
Font = new CoreText.CTFont (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultFontSize + 1),
108+
Font = new CoreText.CTFont (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultMenuFontSize),
103109
})
104110
};
105111

@@ -110,11 +116,11 @@ private void PopUpContextMenu ()
110116
this.popUpContextMenu.AddItem (NSMenuItem.SeparatorItem);
111117

112118
// TODO If we add more menu items consider making the Label/Command a dictionary that we can iterate over to populate everything.
113-
this.popUpContextMenu.AddItem (new CommandMenuItem (Properties.Resources.Reset, viewModel.ClearValueCommand) {
119+
this.popUpContextMenu.AddItem (new CommandMenuItem (Properties.Resources.Reset, this.viewModel.ClearValueCommand) {
114120
AttributedTitle = new Foundation.NSAttributedString (
115121
Properties.Resources.Reset,
116122
new CoreText.CTStringAttributes {
117-
Font = new CoreText.CTFont (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultFontSize + 1),
123+
Font = new CoreText.CTFont (PropertyEditorControl.DefaultFontName, PropertyEditorControl.DefaultMenuFontSize),
118124
})
119125
});
120126
}
@@ -131,34 +137,34 @@ private void ToggleFocusImage (bool focused = false)
131137
if (this.viewModel != null) {
132138

133139
switch (this.viewModel.ValueSource) {
134-
case ValueSource.Binding:
135-
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-bound-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-bound-mac-10");
136-
break;
137-
138-
case ValueSource.Default:
139-
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-default-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-default-mac-10");
140-
break;
141-
142-
case ValueSource.Local:
143-
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-local-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-local-mac-10");
144-
break;
145-
146-
case ValueSource.Inherited:
147-
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-10");
148-
break;
149-
150-
case ValueSource.Resource:
151-
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-10");
152-
break;
153-
154-
case ValueSource.Unset:
155-
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-default-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-default-mac-10");
156-
break;
157-
158-
default:
159-
// To Handle ValueSource.DefaultStyle, ValueSource.Style etc.
160-
Image = null;
161-
break;
140+
case ValueSource.Binding:
141+
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-bound-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-bound-mac-10");
142+
break;
143+
144+
case ValueSource.Default:
145+
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-default-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-default-mac-10");
146+
break;
147+
148+
case ValueSource.Local:
149+
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-local-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-local-mac-10");
150+
break;
151+
152+
case ValueSource.Inherited:
153+
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-10");
154+
break;
155+
156+
case ValueSource.Resource:
157+
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-inherited-mac-10");
158+
break;
159+
160+
case ValueSource.Unset:
161+
Image = focused ? this.hostResources.GetNamedImage ("pe-property-button-default-mac-active-10") : this.hostResources.GetNamedImage ("pe-property-button-default-mac-10");
162+
break;
163+
164+
default:
165+
// To Handle ValueSource.DefaultStyle, ValueSource.Style etc.
166+
Image = null;
167+
break;
162168
}
163169
}
164170
}
@@ -228,13 +234,25 @@ private void OnResourceRequested (object sender, EventArgs e)
228234
Appearance = EffectiveAppearance
229235
};
230236

231-
var resourceSelectorPopOver = new AutoClosePopOver(this.hostResources) {
237+
var resourceSelectorPopOver = new AutoClosePopOver (this.hostResources) {
232238
ContentViewController = new NSViewController (null, null) { View = requestResourceView },
233239
};
234240

235241
requestResourceView.PopOver = resourceSelectorPopOver;
236242

237243
resourceSelectorPopOver.Show (requestResourceView.Frame, (NSView)this, NSRectEdge.MinYEdge);
238244
}
245+
246+
private void OnCreateVariantRequested (object sender, CreateVariantEventArgs e)
247+
{
248+
var createVariantWindow = new CreateVariantWindow (this.hostResources, this.viewModel) {
249+
Appearance = EffectiveAppearance,
250+
};
251+
252+
var result = (NSModalResponse)(int)NSApplication.SharedApplication.RunModalForWindow (createVariantWindow);
253+
if (result == NSModalResponse.OK) {
254+
e.Variation = Task.FromResult (createVariantWindow.ViewModel.Variation);
255+
}
256+
}
239257
}
240258
}

‎Xamarin.PropertyEditing.Mac/Controls/CustomExpressionView.cs

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ internal class CustomExpressionView : BasePopOverViewModelControl
1515
private const string PreviewCustomExpressionString = "PreviewCustomExpression";
1616
private const string AutocompleteItemsString = "AutocompleteItems";
1717

18-
public AutoClosePopOver PopOver { get; internal set; }
19-
2018
public CustomExpressionView (IHostResourceProvider hostResources, PropertyViewModel viewModel)
2119
: base (hostResources, viewModel, Properties.Resources.CustomExpression, "pe-custom-expression-32")
2220
{

‎Xamarin.PropertyEditing.Mac/Controls/EditorContainer.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public NSView LeftEdgeView
5757

5858
public override void ViewWillMoveToSuperview (NSView newSuperview)
5959
{
60-
if (newSuperview == null && EditorView != null)
61-
EditorView.ViewModel = null;
60+
if (newSuperview == null)
61+
ViewModel = null;
6262

6363
base.ViewWillMoveToSuperview (newSuperview);
6464
}

‎Xamarin.PropertyEditing.Mac/Controls/EntryPropertyEditor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Xamarin.PropertyEditing.Mac
88
internal abstract class EntryPropertyEditor<T>
99
: PropertyEditorControl<PropertyViewModel<T>>
1010
{
11-
public EntryPropertyEditor (IHostResourceProvider hostResources)
11+
protected EntryPropertyEditor (IHostResourceProvider hostResources)
1212
: base (hostResources)
1313
{
1414
Entry = new PropertyTextField {

‎Xamarin.PropertyEditing.Mac/Controls/PropertyEditorControl.cs

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public IHostResourceProvider HostResources
3030

3131
public const int DefaultControlHeight = 24;
3232
public const int DefaultFontSize = 11;
33+
public const int DefaultMenuFontSize = DefaultFontSize + 1;
3334
public const int DefaultPropertyLabelFontSize = 11;
3435
public const int DefaultDescriptionLabelFontSize = 9;
3536
public const string DefaultFontName = ".AppleSystemUIFont";

‎Xamarin.PropertyEditing.Mac/Controls/RequestResource/RequestResourceView.cs

-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ internal class RequestResourceView
2626
NSSegmentedControl segmentedControl;
2727
NSButton showPreviewImage;
2828
RequestResourcePanel resourceSelectorPanel;
29-
30-
public NSPopover PopOver { get; internal set; }
31-
3229
private bool showPreview;
3330
public bool ShowPreview
3431
{

‎Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs

+79-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
using System;
12
using System.Collections;
23
using System.Collections.Generic;
34
using System.Linq;
45

56
using AppKit;
6-
7+
using Foundation;
78
using Xamarin.PropertyEditing.ViewModels;
89

910
namespace Xamarin.PropertyEditing.Mac
@@ -79,6 +80,79 @@ protected override void OnViewModelChanged (PropertyViewModel oldModel)
7980
this.editorInputModeConstraint.Active = ViewModel.HasInputModes;
8081
}
8182

83+
if (ViewModel.HasVariations) {
84+
if (ViewModel.Variation != null) {
85+
86+
var selectedVariationOptions = string.Empty;
87+
foreach (PropertyVariationOption item in ViewModel.Variation) {
88+
selectedVariationOptions += string.Format ("[{0}:{1}]", item.Category, item.Name);
89+
}
90+
91+
if (ViewModel.GetIsLastVariant ()) {
92+
if (this.endVariantButton == null) {
93+
this.endVariantButton = new NSButton {
94+
TranslatesAutoresizingMaskIntoConstraints = false,
95+
Title = "└",
96+
};
97+
98+
AddSubview (this.endVariantButton);
99+
AddConstraints (new[] {
100+
NSLayoutConstraint.Create (Entry, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this.endVariantButton, NSLayoutAttribute.Right, 1, 4),
101+
NSLayoutConstraint.Create (this.endVariantButton, NSLayoutAttribute.CenterY, NSLayoutRelation.Equal, this, NSLayoutAttribute.CenterY, 1f, 0f),
102+
NSLayoutConstraint.Create (this.endVariantButton, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, 0),
103+
NSLayoutConstraint.Create (this.endVariantButton, NSLayoutAttribute.Width, NSLayoutRelation.Equal, 1f, 18f),
104+
});
105+
}
106+
Entry.StringValue = selectedVariationOptions;
107+
} else {
108+
if (this.midVariantButton == null) {
109+
this.midVariantButton = new NSButton {
110+
TranslatesAutoresizingMaskIntoConstraints = false,
111+
Title = "├",
112+
};
113+
114+
AddSubview (this.midVariantButton);
115+
AddConstraints (new[] {
116+
NSLayoutConstraint.Create (this.midVariantButton, NSLayoutAttribute.CenterY, NSLayoutRelation.Equal, this, NSLayoutAttribute.CenterY, 1f, 0f),
117+
NSLayoutConstraint.Create (this.midVariantButton, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, 0),
118+
NSLayoutConstraint.Create (this.midVariantButton, NSLayoutAttribute.Width, NSLayoutRelation.Equal, 1f, 18f),
119+
});
120+
}
121+
Entry.StringValue = selectedVariationOptions;
122+
}
123+
124+
if (this.deleteVariantButton == null) {
125+
this.deleteVariantButton = new CommandButton {
126+
Command = ViewModel.RemoveVariationCommand,
127+
TranslatesAutoresizingMaskIntoConstraints = false,
128+
Title = "X",
129+
};
130+
131+
AddSubview (this.deleteVariantButton);
132+
AddConstraints (new[] {
133+
NSLayoutConstraint.Create (this.deleteVariantButton, NSLayoutAttribute.CenterY, NSLayoutRelation.Equal, this, NSLayoutAttribute.CenterY, 1f, 0f),
134+
NSLayoutConstraint.Create (this.deleteVariantButton, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, 20),
135+
NSLayoutConstraint.Create (this.deleteVariantButton, NSLayoutAttribute.Width, NSLayoutRelation.Equal, 1f, 18f),
136+
});
137+
}
138+
} else {
139+
if (this.addVariantButton == null) {
140+
this.addVariantButton = new CommandButton {
141+
Command = ViewModel.RequestCreateVariantCommand,
142+
TranslatesAutoresizingMaskIntoConstraints = false,
143+
Title = "┼",
144+
};
145+
146+
AddSubview (this.addVariantButton);
147+
AddConstraints (new[] {
148+
NSLayoutConstraint.Create (this.addVariantButton, NSLayoutAttribute.CenterY, NSLayoutRelation.Equal, this, NSLayoutAttribute.CenterY, 1f, 0f),
149+
NSLayoutConstraint.Create (this.addVariantButton, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, 0),
150+
NSLayoutConstraint.Create (this.addVariantButton, NSLayoutAttribute.Width, NSLayoutRelation.Equal, 1f, 18f),
151+
});
152+
}
153+
}
154+
}
155+
82156
SetEnabled ();
83157
}
84158

@@ -105,6 +179,10 @@ protected override void UpdateAccessibilityValues ()
105179
private NSLayoutConstraint editorInputModeConstraint;
106180
private NSPopUpButton inputModePopup;
107181
private IReadOnlyList<InputMode> viewModelInputModes;
182+
private NSButton addVariantButton;
183+
private NSButton endVariantButton;
184+
private NSButton midVariantButton;
185+
private NSButton deleteVariantButton;
108186
}
109187
}
110188

0 commit comments

Comments
 (0)