Skip to content
This repository was archived by the owner on Sep 25, 2024. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5fdabb4

Browse files
Dominique LouisCartBlanche
Dominique Louis
authored and
CartBlanche
committedJul 3, 2019
[Mac] Initial Variations Implementation
1 parent 50cbb49 commit 5fdabb4

21 files changed

+521
-75
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/DrawingExtensions.cs

+28
Original file line numberDiff line numberDiff line change
@@ -116,5 +116,33 @@ public static CommonColor UpdateCMYK (
116116
k: k ?? color.K,
117117
alpha: alpha ?? color.A);
118118
}
119+
120+
public static CGPath ToCGPath (this NSBezierPath nsPath)
121+
{
122+
var cgPath = new CGPath ();
123+
for (var i = 0; i < nsPath.ElementCount; i++) {
124+
NSBezierPathElement type = nsPath.ElementAt (i, out CGPoint[] points);
125+
126+
switch (type) {
127+
case NSBezierPathElement.ClosePath:
128+
cgPath.CloseSubpath ();
129+
break;
130+
131+
case NSBezierPathElement.CurveTo:
132+
cgPath.AddCurveToPoint (points[0], points[1], points[2]);
133+
break;
134+
135+
case NSBezierPathElement.LineTo:
136+
cgPath.AddLineToPoint (points[0]);
137+
break;
138+
139+
case NSBezierPathElement.MoveTo:
140+
cgPath.MoveToPoint (points[0]);
141+
break;
142+
}
143+
}
144+
145+
return cgPath;
146+
}
119147
}
120148
}

‎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/Custom/UnfocusableTextField.cs

+5
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ public NSColor TextColor {
3939
internal set { this.label.TextColor = value; }
4040
}
4141

42+
public bool Bordered {
43+
get { return this.label.Bordered; }
44+
internal set { this.label.Bordered = value; }
45+
}
46+
4247
public virtual NSBackgroundStyle BackgroundStyle
4348
{
4449
[Export ("backgroundStyle")] get => this.label.Cell.BackgroundStyle;

‎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

+128-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
using System;
2+
using System.Collections.Generic;
13
using AppKit;
4+
using CoreAnimation;
5+
using CoreGraphics;
26
using Xamarin.PropertyEditing.ViewModels;
37

48
namespace Xamarin.PropertyEditing.Mac
@@ -24,6 +28,125 @@ public EditorViewModel ViewModel
2428

2529
if (EditorView.NeedsPropertyButton)
2630
PropertyButton.ViewModel = value as PropertyViewModel;
31+
32+
UpdateVariations (value as PropertyViewModel);
33+
}
34+
}
35+
36+
private void UpdateVariations (PropertyViewModel propertyViewModel)
37+
{
38+
if (propertyViewModel != null) {
39+
if (propertyViewModel.HasVariations) {
40+
41+
if (propertyViewModel.IsVariant) {
42+
WantsLayer = true;
43+
44+
if (propertyViewModel.GetIsLastVariant ()) {
45+
var endLineShape = new CAShapeLayer ();
46+
var endLinePath = new NSBezierPath ();
47+
48+
endLinePath.MoveTo (new CGPoint (10, 35));
49+
endLinePath.Append (new CGPoint[] { new CGPoint (10, 65) });
50+
endLinePath.MoveTo (new CGPoint (10, 35));
51+
endLinePath.Append (new CGPoint[] { new CGPoint (15, 35) });
52+
endLineShape.Path = endLinePath.ToCGPath ();
53+
endLineShape.FillColor = null;
54+
endLineShape.Opacity = 1.0f;
55+
endLineShape.StrokeColor = HostResources.GetNamedColor (NamedResources.ForegroundColor).CGColor;
56+
Layer.AddSublayer (endLineShape);
57+
58+
this.variationLayersList.Add (endLineShape);
59+
} else {
60+
var midLineShape = new CAShapeLayer ();
61+
var midLinePath = new NSBezierPath ();
62+
63+
midLinePath.MoveTo (new CGPoint (10, 0));
64+
midLinePath.Append (new CGPoint[] { new CGPoint (10, 55) });
65+
midLinePath.MoveTo (new CGPoint (10, 35));
66+
midLinePath.Append (new CGPoint[] { new CGPoint (15, 35) });
67+
midLineShape.Path = midLinePath.ToCGPath ();
68+
midLineShape.FillColor = null;
69+
midLineShape.Opacity = 1.0f;
70+
midLineShape.StrokeColor = HostResources.GetNamedColor (NamedResources.ForegroundColor).CGColor;
71+
Layer.AddSublayer (midLineShape);
72+
73+
this.variationLayersList.Add (midLineShape);
74+
}
75+
76+
77+
var deleteVariantButton = new CommandButton {
78+
Bordered = false,
79+
Command = propertyViewModel.RemoveVariationCommand,
80+
TranslatesAutoresizingMaskIntoConstraints = false,
81+
Title = "x",
82+
ToolTip = Properties.Resources.RemoveVariant,
83+
};
84+
85+
AddSubview (deleteVariantButton);
86+
AddConstraints (new[] {
87+
NSLayoutConstraint.Create (deleteVariantButton, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, 3f),
88+
NSLayoutConstraint.Create (deleteVariantButton, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, 12f),
89+
NSLayoutConstraint.Create (deleteVariantButton, NSLayoutAttribute.Width, NSLayoutRelation.Equal, 1f, 16f),
90+
91+
});
92+
93+
this.variationControlsList.Add (deleteVariantButton);
94+
95+
NSView previousControl = deleteVariantButton;
96+
foreach (PropertyVariationOption item in propertyViewModel.Variation) {
97+
var selectedVariationTextField = new UnfocusableTextField {
98+
BackgroundColor = HostResources.GetNamedColor (NamedResources.FrameBoxButtonBackgroundColor),
99+
Bordered = false,
100+
TranslatesAutoresizingMaskIntoConstraints = false,
101+
StringValue = string.Format (" {0}: {1} ", item.Category, item.Name),
102+
};
103+
104+
AddSubview (selectedVariationTextField);
105+
AddConstraints (new[] {
106+
NSLayoutConstraint.Create (selectedVariationTextField, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, 3f),
107+
NSLayoutConstraint.Create (selectedVariationTextField, NSLayoutAttribute.Left, NSLayoutRelation.Equal, previousControl, NSLayoutAttribute.Right, 1f, 3f),
108+
NSLayoutConstraint.Create (selectedVariationTextField, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1f, 16f),
109+
});
110+
111+
previousControl = selectedVariationTextField;
112+
this.variationControlsList.Add (selectedVariationTextField);
113+
}
114+
} else {
115+
116+
var addVariantButton = new CommandButton {
117+
Bordered = false,
118+
Command = propertyViewModel.RequestCreateVariantCommand,
119+
TranslatesAutoresizingMaskIntoConstraints = false,
120+
Title = "+",
121+
ToolTip = Properties.Resources.AddVariant,
122+
};
123+
124+
AddSubview (addVariantButton);
125+
AddConstraints (new[] {
126+
NSLayoutConstraint.Create (addVariantButton, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, 3f),
127+
NSLayoutConstraint.Create (addVariantButton, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, 2f),
128+
NSLayoutConstraint.Create (addVariantButton, NSLayoutAttribute.Width, NSLayoutRelation.Equal, 1f, 16f),
129+
});
130+
131+
this.variationControlsList.Add (addVariantButton);
132+
}
133+
}
134+
} else {
135+
// Clear up required, if we reuse this view
136+
WantsLayer = false;
137+
138+
139+
foreach (CALayer item in this.variationLayersList) {
140+
item.RemoveFromSuperLayer ();
141+
}
142+
143+
this.variationLayersList.Clear ();
144+
145+
foreach (NSView item in this.variationControlsList) {
146+
item.RemoveFromSuperview ();
147+
}
148+
149+
this.variationControlsList.Clear ();
27150
}
28151
}
29152

@@ -57,8 +180,8 @@ public NSView LeftEdgeView
57180

58181
public override void ViewWillMoveToSuperview (NSView newSuperview)
59182
{
60-
if (newSuperview == null && EditorView != null)
61-
EditorView.ViewModel = null;
183+
if (newSuperview == null)
184+
ViewModel = null;
62185

63186
base.ViewWillMoveToSuperview (newSuperview);
64187
}
@@ -71,5 +194,8 @@ public NSColor LabelTextColor {
71194

72195
private NSView leftEdgeView;
73196
private NSLayoutConstraint leftEdgeLeftConstraint, leftEdgeVCenterConstraint;
197+
198+
private List<NSView> variationControlsList = new List<NSView> ();
199+
private List<CALayer> variationLayersList = new List<CALayer> ();
74200
}
75201
}

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

+2-3
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 {
@@ -21,10 +21,9 @@ public EntryPropertyEditor (IHostResourceProvider hostResources)
2121

2222
RightEdgeConstraint = NSLayoutConstraint.Create (Entry, NSLayoutAttribute.Right, NSLayoutRelation.Equal, this, NSLayoutAttribute.Right, 1f, 0);
2323
AddConstraints (new[] {
24-
NSLayoutConstraint.Create (Entry, NSLayoutAttribute.CenterY, NSLayoutRelation.Equal, this, NSLayoutAttribute.CenterY, 1f, 0),
24+
NSLayoutConstraint.Create (Entry, NSLayoutAttribute.Bottom, NSLayoutRelation.Equal, this, NSLayoutAttribute.Bottom, 1f, -2),
2525
NSLayoutConstraint.Create (Entry, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1, 0),
2626
RightEdgeConstraint,
27-
NSLayoutConstraint.Create (Entry, NSLayoutAttribute.Height, NSLayoutRelation.Equal, this, NSLayoutAttribute.Height, 1, -6),
2827
});
2928
}
3029

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

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ public PropertyContainer (IHostResourceProvider hostResources, INativeContainer
1111
if (hostResources == null)
1212
throw new ArgumentNullException (nameof (hostResources));
1313

14+
HostResources = hostResources;
15+
1416
NativeContainer = nativeView;
1517

1618
AddSubview (this.label);
@@ -89,5 +91,7 @@ protected INativeContainer NativeContainer
8991
},
9092
TranslatesAutoresizingMaskIntoConstraints = false,
9193
};
94+
95+
public IHostResourceProvider HostResources { get; private set; }
9296
}
9397
}

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

+14
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";
@@ -155,5 +156,18 @@ public PropertyEditorControl (IHostResourceProvider hostResources)
155156
get { return (TViewModel)base.ViewModel; }
156157
set { base.ViewModel = value; }
157158
}
159+
160+
public override bool IsDynamicallySized => true;
161+
162+
public override nint GetHeight (EditorViewModel vm)
163+
{
164+
nint baseHeight = base.GetHeight (vm);
165+
var realVm = (PropertyViewModel)vm;
166+
if (realVm != null && realVm.IsVariant) {
167+
return baseHeight * 2;
168+
}
169+
170+
return baseHeight;
171+
}
158172
}
159173
}

‎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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
using System.Collections;
1+
using System;
22
using System.Collections.Generic;
33
using System.Linq;
44

55
using AppKit;
6-
76
using Xamarin.PropertyEditing.ViewModels;
87

98
namespace Xamarin.PropertyEditing.Mac

‎Xamarin.PropertyEditing.Mac/Controls/Variations/CreateVariantView.cs

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
using System;
2+
using System.Reflection;
3+
using System.Threading.Tasks;
4+
using AppKit;
5+
using CoreGraphics;
6+
using Foundation;
7+
using Xamarin.PropertyEditing.ViewModels;
8+
9+
namespace Xamarin.PropertyEditing.Mac
10+
{
11+
internal class CreateVariantView
12+
: NSView
13+
{
14+
private const int ControlSpacing = 7;
15+
private const int HorizontalControlSpacing = 10;
16+
internal const int RightEdgeMargin = 12;
17+
18+
private IHostResourceProvider hostResources;
19+
20+
public CreateVariantView (IHostResourceProvider hostResources, CGSize windowWidthHeight, CreateVariantViewModel createVariantViewModel)
21+
{
22+
if (hostResources == null)
23+
throw new ArgumentNullException (nameof (hostResources));
24+
25+
this.hostResources = hostResources;
26+
27+
Initialize (createVariantViewModel, windowWidthHeight);
28+
29+
this.SetAppearance (this.hostResources.GetVibrantAppearance (EffectiveAppearance));
30+
}
31+
32+
private void Initialize (CreateVariantViewModel createVariantViewModel, CGSize windowWidthHeight)
33+
{
34+
Frame = new CGRect (CGPoint.Empty, windowWidthHeight);
35+
36+
int editorHeight = 18;
37+
38+
var FrameWidthThird = Frame.Width / 3;
39+
40+
var introduceVariation = new UnfocusableTextField {
41+
Appearance = this.hostResources.GetVibrantAppearance (EffectiveAppearance),
42+
StringValue = Properties.Resources.AddVariationHelpText,
43+
TranslatesAutoresizingMaskIntoConstraints = false,
44+
};
45+
46+
AddSubview (introduceVariation);
47+
48+
this.AddConstraints (new[] {
49+
NSLayoutConstraint.Create (introduceVariation, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, 8f),
50+
NSLayoutConstraint.Create (introduceVariation, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, 18f),
51+
NSLayoutConstraint.Create (introduceVariation, NSLayoutAttribute.Width, NSLayoutRelation.Equal, this, NSLayoutAttribute.Width, 1f, 0f),
52+
NSLayoutConstraint.Create (introduceVariation, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1f, editorHeight),
53+
});
54+
55+
var controlTop = 33;
56+
57+
foreach (var viewModel in createVariantViewModel.VariationCategories) {
58+
59+
var name = new UnfocusableTextField {
60+
Alignment = NSTextAlignment.Right,
61+
Appearance = this.hostResources.GetVibrantAppearance (EffectiveAppearance),
62+
StringValue = viewModel.Name + ":",
63+
TranslatesAutoresizingMaskIntoConstraints = false,
64+
};
65+
66+
AddSubview (name);
67+
68+
this.AddConstraints (new[] {
69+
NSLayoutConstraint.Create (name, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, controlTop),
70+
NSLayoutConstraint.Create (name, NSLayoutAttribute.Right, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, FrameWidthThird),
71+
NSLayoutConstraint.Create (name, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1f, editorHeight)
72+
});
73+
74+
var popUpButton = new FocusablePopUpButton {
75+
Appearance = this.hostResources.GetVibrantAppearance (EffectiveAppearance),
76+
ControlSize = NSControlSize.Small,
77+
Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small)),
78+
TranslatesAutoresizingMaskIntoConstraints = false,
79+
};
80+
81+
popUpButton.Activated += (o, e) => {
82+
if (o is FocusablePopUpButton fpb) {
83+
if (fpb.SelectedItem.RepresentedObject is NSObjectFacade menuObjectFacade) {
84+
if (menuObjectFacade.Target is VariationFacade vf) {
85+
vf.ViewModel.SelectedOption = vf.Option;
86+
}
87+
}
88+
}
89+
};
90+
91+
var popUpButtonList = new NSMenu ();
92+
popUpButton.Menu = popUpButtonList;
93+
94+
AddSubview (popUpButton);
95+
96+
this.AddConstraints (new[] {
97+
NSLayoutConstraint.Create (popUpButton, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, controlTop),
98+
NSLayoutConstraint.Create (popUpButton, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, FrameWidthThird + ControlSpacing),
99+
NSLayoutConstraint.Create (popUpButton, NSLayoutAttribute.Width, NSLayoutRelation.Equal, this, NSLayoutAttribute.Width, 1f, -FrameWidthThird - ControlSpacing - RightEdgeMargin),
100+
NSLayoutConstraint.Create (popUpButton, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1f, editorHeight)
101+
});
102+
103+
foreach (var variation in viewModel.Variations) {
104+
popUpButtonList.AddItem (new NSMenuItem (variation.Name) {
105+
RepresentedObject = new NSObjectFacade (
106+
new VariationFacade {
107+
Option = variation,
108+
ViewModel = viewModel
109+
}
110+
)
111+
});
112+
}
113+
114+
controlTop += editorHeight + HorizontalControlSpacing;
115+
}
116+
117+
Frame = new CGRect (CGPoint.Empty, new CGSize (Frame.Width, controlTop /* + editorHeight * 2*/));
118+
}
119+
}
120+
121+
internal class VariationFacade
122+
{
123+
public PropertyVariationOption Option { get; set; }
124+
public VariationViewModel ViewModel { get; set; }
125+
}
126+
}

‎Xamarin.PropertyEditing.Mac/Controls/Variations/CreateVariantWindow.cs

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
using System;
2+
using AppKit;
3+
using CoreGraphics;
4+
using Xamarin.PropertyEditing.ViewModels;
5+
6+
namespace Xamarin.PropertyEditing.Mac
7+
{
8+
internal class CreateVariantWindow : NSPanel
9+
{
10+
public CreateVariantViewModel ViewModel { get; }
11+
12+
private new ModalWindowCloseDelegate Delegate
13+
{
14+
get => (ModalWindowCloseDelegate)base.Delegate;
15+
set => base.Delegate = value;
16+
}
17+
18+
private const int minWindowWidth = 250;
19+
private const int minWindowHeight = 170;
20+
21+
internal CreateVariantWindow (IHostResourceProvider hostResources, PropertyViewModel propertyViewModel)
22+
: base (new CGRect (0, 0, minWindowWidth, minWindowHeight), NSWindowStyle.Titled | NSWindowStyle.Closable | NSWindowStyle.Resizable, NSBackingStore.Buffered, true)
23+
{
24+
if (hostResources == null)
25+
throw new ArgumentNullException (nameof (hostResources));
26+
if (propertyViewModel == null)
27+
throw new ArgumentNullException (nameof (propertyViewModel));
28+
29+
Delegate = new ModalWindowCloseDelegate ();
30+
31+
FloatingPanel = true;
32+
33+
Title = Properties.Resources.AddVariationTitle;
34+
35+
MaxSize = new CGSize (minWindowWidth * 2, minWindowHeight * 2); // TODO discuss what the Max/Min Size should be and if we should have one.
36+
MinSize = new CGSize (minWindowWidth, minWindowHeight);
37+
38+
// put the MainContainer inside this panel's ContentView
39+
ViewModel = new CreateVariantViewModel (propertyViewModel.Property);
40+
var createVariantView = new CreateVariantView (hostResources, new CGSize(minWindowWidth, minWindowHeight), ViewModel) {
41+
TranslatesAutoresizingMaskIntoConstraints = false
42+
};
43+
ContentView.AddSubview (createVariantView);
44+
45+
ContentView.AddConstraints (new[] {
46+
NSLayoutConstraint.Create (createVariantView, NSLayoutAttribute.Top, NSLayoutRelation.Equal, ContentView, NSLayoutAttribute.Top, 1f, 0f),
47+
NSLayoutConstraint.Create (createVariantView, NSLayoutAttribute.Left, NSLayoutRelation.Equal, ContentView, NSLayoutAttribute.Left, 1f, 0f),
48+
NSLayoutConstraint.Create (createVariantView, NSLayoutAttribute.Height, NSLayoutRelation.Equal, ContentView, NSLayoutAttribute.Height, 1f, 0f),
49+
NSLayoutConstraint.Create (createVariantView, NSLayoutAttribute.Width, NSLayoutRelation.Equal, ContentView, NSLayoutAttribute.Width, 1f, 0f),
50+
51+
});
52+
53+
var buttonOK = new FocusableCommandButton {
54+
BezelStyle = NSBezelStyle.Rounded,
55+
KeyEquivalent = "\r",
56+
Command = ViewModel.CreateVariantCommand,
57+
ControlSize = NSControlSize.Regular,
58+
Enabled = false,
59+
Highlighted = true,
60+
Title = Properties.Resources.AddVariation,
61+
TranslatesAutoresizingMaskIntoConstraints = false,
62+
};
63+
64+
buttonOK.Activated += (sender, e) => {
65+
Delegate.Response = NSModalResponse.OK;
66+
Close ();
67+
};
68+
69+
ContentView.AddSubview (buttonOK);
70+
71+
ContentView.AddConstraints (new[] {
72+
NSLayoutConstraint.Create (buttonOK, NSLayoutAttribute.Bottom, NSLayoutRelation.Equal, ContentView, NSLayoutAttribute.Bottom, 1, -CreateVariantView.RightEdgeMargin),
73+
NSLayoutConstraint.Create (buttonOK, NSLayoutAttribute.Right, NSLayoutRelation.Equal, ContentView, NSLayoutAttribute.Right, 1, -CreateVariantView.RightEdgeMargin),
74+
NSLayoutConstraint.Create (buttonOK, NSLayoutAttribute.Width, NSLayoutRelation.GreaterThanOrEqual, 1, 80)
75+
});
76+
77+
var buttonCancel = new NSButton {
78+
BezelStyle = NSBezelStyle.Rounded,
79+
ControlSize = NSControlSize.Regular,
80+
Title = Properties.Resources.Cancel,
81+
TranslatesAutoresizingMaskIntoConstraints = false,
82+
};
83+
84+
buttonCancel.Activated += (sender, e) => {
85+
Close ();
86+
};
87+
88+
ContentView.AddSubview (buttonCancel);
89+
90+
ContentView.AddConstraints (new[] {
91+
NSLayoutConstraint.Create (buttonCancel, NSLayoutAttribute.Top, NSLayoutRelation.Equal, buttonOK, NSLayoutAttribute.Top, 1f, 0f),
92+
NSLayoutConstraint.Create (buttonCancel, NSLayoutAttribute.Right, NSLayoutRelation.Equal, buttonOK, NSLayoutAttribute.Left, 1f, -10f),
93+
NSLayoutConstraint.Create (buttonCancel, NSLayoutAttribute.Width, NSLayoutRelation.GreaterThanOrEqual, 1f, 80f),
94+
});
95+
}
96+
}
97+
}

‎Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<ProjectReference Include="..\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj" />
1818
</ItemGroup>
1919

20+
<ItemGroup>
21+
<Folder Include="Controls\Variations\" />
22+
</ItemGroup>
2023
<Target Name="IncludeIconsInBundle" BeforeTargets="AssignTargetPaths">
2124
<ItemGroup>
2225
<PropertyEditingResourceBundlePath Include="PropertyEditingResource\**\*" />

‎Xamarin.PropertyEditing/Properties/Resources.Designer.cs

+27-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Xamarin.PropertyEditing/Properties/Resources.resx

+4
Original file line numberDiff line numberDiff line change
@@ -752,4 +752,8 @@
752752
<data name="RemoveVariant" xml:space="preserve">
753753
<value>Remove Variant</value>
754754
</data>
755+
<data name="AddVariation" xml:space="preserve">
756+
<value>Add</value>
757+
<comment>Button text telling the user clicking this will add the variation</comment>
758+
</data>
755759
</root>

0 commit comments

Comments
 (0)
This repository has been archived.