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

Commit db2d949

Browse files
Dominique LouisCartBlanche
Dominique Louis
authored and
CartBlanche
committedOct 8, 2019
[Mac] Initial Variations Implementation
1 parent bf4235a commit db2d949

6 files changed

+55
-52
lines changed
 

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ internal abstract class BasePointEditorControl<T> : PropertyEditorControl<Proper
1616
public override NSView FirstKeyView => XEditor;
1717
public override NSView LastKeyView => YEditor.DecrementButton;
1818

19-
protected override nint BaseHeight => 33;
19+
protected override nint BaseHeight => 36;
2020

2121
protected BasePointEditorControl (IHostResourceProvider hostResources)
2222
: base (hostResources)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal abstract class BaseRectangleEditorControl<T> : PropertyEditorControl<Pr
2222
public override NSView FirstKeyView => XEditor;
2323
public override NSView LastKeyView => HeightEditor.DecrementButton;
2424

25-
protected override nint BaseHeight => 66;
25+
protected override nint BaseHeight => 68;
2626

2727
protected BaseRectangleEditorControl (IHostResourceProvider hostResources)
2828
: base (hostResources)

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

+46-38
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public EditorContainer (IHostResourceProvider hostResources, IEditorView editorV
1717
}
1818

1919
private const string FrameChangedObservableProperty = "frame";
20+
private readonly NSString observerKeyPath = new NSString (FrameChangedObservableProperty);
2021

2122
public IEditorView EditorView => (IEditorView)NativeContainer;
2223

@@ -131,62 +132,63 @@ private void UpdateVariations ()
131132
if (this.viewModelAsPropertyViewModel.HasVariations) {
132133

133134
if (this.viewModelAsPropertyViewModel.IsVariant) {
135+
this.deleteVariantButton = new VariationButton (HostResources, "pe-variation-delete-button-active-mac-10", "pe-variation-delete-button-mac-10") {
136+
AccessibilityEnabled = true,
137+
AccessibilityTitle = Properties.Resources.AccessibilityDeleteVariationButton,
138+
Command = this.viewModelAsPropertyViewModel.RemoveVariationCommand,
139+
ToolTip = Properties.Resources.RemoveVariant,
140+
TranslatesAutoresizingMaskIntoConstraints = false,
141+
};
134142

135-
if (this.deleteVariantButton == null) {
136-
this.deleteVariantButton = new VariationButton (HostResources, "pe-variation-delete-button-active-mac-10", "pe-variation-delete-button-mac-10") {
137-
AccessibilityEnabled = true,
138-
AccessibilityTitle = Properties.Resources.AccessibilityDeleteVariationButton,
139-
Command = this.viewModelAsPropertyViewModel.RemoveVariationCommand,
140-
ToolTip = Properties.Resources.RemoveVariant,
141-
TranslatesAutoresizingMaskIntoConstraints = false,
142-
};
143+
AddSubview (this.deleteVariantButton);
144+
AddConstraints (new[] {
145+
NSLayoutConstraint.Create (this.deleteVariantButton, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, 8f),
146+
NSLayoutConstraint.Create (this.deleteVariantButton, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, 20f),
147+
});
143148

144-
AddSubview (this.deleteVariantButton);
145-
AddConstraints (new[] {
146-
NSLayoutConstraint.Create (this.deleteVariantButton, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, 8f),
147-
NSLayoutConstraint.Create (this.deleteVariantButton, NSLayoutAttribute.Left, NSLayoutRelation.Equal, this, NSLayoutAttribute.Left, 1f, 20f),
148-
});
149+
this.variationControlsList.Add (this.deleteVariantButton);
149150

150-
this.variationControlsList.Add (this.deleteVariantButton);
151+
// Hook into the delete button's frame change, so we can fire off some drawing. If there's a better way, let me know.
152+
this.deleteVariantButton.AddObserver (this, this.observerKeyPath, NSKeyValueObservingOptions.New, IntPtr.Zero);
151153

152-
// Hook into the delete button's frame change, so we can fire off some drawing. If there's a better way, let me know.
153-
this.deleteVariantButton.AddObserver (this, new NSString (FrameChangedObservableProperty), NSKeyValueObservingOptions.New, IntPtr.Zero);
154-
}
154+
NextKeyView = this.deleteVariantButton;
155+
156+
// Cache these before the loop
157+
var variationBgColour = HostResources.GetNamedColor (NamedResources.FrameBoxButtonBackgroundColor);
155158

156159
NSView previousControl = this.deleteVariantButton;
157160
foreach (PropertyVariationOption item in this.viewModelAsPropertyViewModel.Variation) {
158-
var selectedVariationTextField = new UnfocusableTextField {
159-
BackgroundColor = HostResources.GetNamedColor (NamedResources.FrameBoxButtonBackgroundColor),
161+
var selectedVariationTextField = new UnfocusableTextField {
162+
BackgroundColor = variationBgColour,
160163
Bordered = false,
161-
Font = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small) - 1f),
164+
Font = VariationOptionFont,
162165
TranslatesAutoresizingMaskIntoConstraints = false,
163166
StringValue = string.Format (" {0}: {1} ", item.Category, item.Name),
164167
};
165168

166169
AddSubview (selectedVariationTextField);
167-
AddConstraints (new[] {
168-
NSLayoutConstraint.Create (selectedVariationTextField, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, 5f),
170+
AddConstraints (new[] {
171+
NSLayoutConstraint.Create (selectedVariationTextField, NSLayoutAttribute.Top, NSLayoutRelation.Equal, this, NSLayoutAttribute.Top, 1f, VariationBorderOffset),
169172
NSLayoutConstraint.Create (selectedVariationTextField, NSLayoutAttribute.Left, NSLayoutRelation.Equal, previousControl, NSLayoutAttribute.Right, 1f, 6f),
170173
NSLayoutConstraint.Create (selectedVariationTextField, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1f, 16f),
171174
});
172175

173176
previousControl = selectedVariationTextField;
174177
this.variationControlsList.Add (selectedVariationTextField);
175178
}
176-
} else {
177-
if (this.addVariantButton == null) {
178-
this.addVariantButton = new VariationButton (HostResources, "pe-variation-add-button-active-mac-10", "pe-variation-add-button-mac-10") {
179-
AccessibilityEnabled = true,
180-
AccessibilityTitle = Properties.Resources.AccessibilityAddVariationButton,
181-
Command = this.viewModelAsPropertyViewModel.RequestCreateVariantCommand,
182-
ToolTip = Properties.Resources.AddVariant,
183-
TranslatesAutoresizingMaskIntoConstraints = false,
184-
};
185-
186-
LeftEdgeView = this.addVariantButton;
187-
188-
this.variationControlsList.Add (this.addVariantButton);
189-
}
179+
} else {
180+
this.addVariantButton = new VariationButton (HostResources, "pe-variation-add-button-active-mac-10", "pe-variation-add-button-mac-10") {
181+
AccessibilityEnabled = true,
182+
AccessibilityTitle = Properties.Resources.AccessibilityAddVariationButton,
183+
Command = this.viewModelAsPropertyViewModel.RequestCreateVariantCommand,
184+
ToolTip = Properties.Resources.AddVariant,
185+
TranslatesAutoresizingMaskIntoConstraints = false,
186+
};
187+
188+
LeftEdgeView = this.addVariantButton;
189+
NextKeyView = this.addVariantButton;
190+
191+
this.variationControlsList.Add (this.addVariantButton);
190192
}
191193
}
192194
}
@@ -201,7 +203,11 @@ private void ClearSubViews ()
201203
this.variationControlsList.Clear ();
202204

203205
this.addVariantButton = null;
204-
this.deleteVariantButton = null;
206+
207+
if (this.deleteVariantButton != null) {
208+
this.deleteVariantButton.RemoveObserver (this, this.observerKeyPath);
209+
this.deleteVariantButton = null;
210+
}
205211
}
206212

207213
private void ClearChildLayers ()
@@ -315,8 +321,10 @@ public NSColor LabelTextColor {
315321
private VariationButton addVariantButton;
316322
private const float treeLineLeftEdge = 14f;
317323
private const float treeLineLeafIndent = 4f;
324+
internal const float VariationBorderOffset = 5f;
325+
internal static NSFont VariationOptionFont = NSFont.SystemFontOfSize (NSFont.SystemFontSizeForControlSize (NSControlSize.Small) - 1f);
318326
private nfloat ViewVariationChildVerticalDrawPoint => this.deleteVariantButton.Frame.Top + 5;
319327
private nfloat ViewVariationParentVerticalDrawPoint => this.addVariantButton.Frame.Top - 2;
320328
private PropertyViewModel viewModelAsPropertyViewModel;
321329
}
322-
}
330+
}

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

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ namespace Xamarin.PropertyEditing.Mac
1010
{
1111
internal abstract class PointEditorControl<T> : BasePointEditorControl<T>
1212
{
13-
protected override float HeightScaleFactor => 1.8f;
14-
1513
public PointEditorControl (IHostResourceProvider hostResources)
1614
: base (hostResources)
1715
{

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@ public IHostResourceProvider HostResources
3737
public virtual bool IsDynamicallySized => false;
3838
public const float BottomOffset = -2f;
3939
protected virtual nint BaseHeight => 24;
40-
protected virtual float HeightScaleFactor => 2.0f;
4140

4241
PropertyViewModel viewModel;
4342
public PropertyViewModel ViewModel {
4443
get { return this.viewModel; }
4544
set {
46-
if (this.ViewModel == value)
45+
if (this.viewModel == value)
4746
return;
4847

4948
PropertyViewModel oldModel = this.viewModel;
@@ -93,11 +92,11 @@ public void UpdateKeyViews ()
9392
} while (row > 0 && ctrl == null);
9493

9594
if (ctrl != null) {
96-
VariationButton vb = Superview.Subviews.OfType<VariationButton> ().FirstOrDefault ();
97-
if (vb != null) {
98-
vb.NextKeyView = FirstKeyView;
99-
ctrl.LastKeyView.NextKeyView = vb;
100-
} else {
95+
if (Superview is EditorContainer editorContainer && editorContainer.NextKeyView != null) {
96+
editorContainer.NextKeyView.NextKeyView = FirstKeyView;
97+
ctrl.LastKeyView.NextKeyView = editorContainer.NextKeyView;
98+
}
99+
else {
101100
ctrl.LastKeyView.NextKeyView = FirstKeyView;
102101
}
103102
ctrl.UpdateKeyViews ();
@@ -110,7 +109,7 @@ public void UpdateKeyViews ()
110109
public virtual nint GetHeight (EditorViewModel vm)
111110
{
112111
if (vm is PropertyViewModel realVm && realVm.IsVariant) {
113-
return (nint)(BaseHeight * HeightScaleFactor);
112+
return (nint)(BaseHeight + EditorContainer.VariationOptionFont.BoundingRectForFont.Height + (EditorContainer.VariationBorderOffset * 2)); // * 2 for upper and lower borders
114113
}
115114

116115
return BaseHeight;

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

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ namespace Xamarin.PropertyEditing.Mac
1111
internal abstract class RectangleEditorControl<T>
1212
: BaseRectangleEditorControl<T>
1313
{
14-
protected override float HeightScaleFactor => 1.4f;
15-
1614
protected RectangleEditorControl (IHostResourceProvider hostResources)
1715
: base (hostResources)
1816
{

0 commit comments

Comments
 (0)