Browse Source

Make Tests work

pull/5682/head
amwx 5 years ago
parent
commit
02b529cbd6
  1. 5
      src/Avalonia.Controls/Control.cs
  2. 5
      src/Avalonia.Controls/Flyouts/Flyout.cs
  3. 5
      src/Avalonia.Controls/Flyouts/MenuFlyout.cs

5
src/Avalonia.Controls/Control.cs

@ -110,6 +110,11 @@ namespace Avalonia.Controls
/// <inheritdoc/>
void ISetterValue.Initialize(ISetter setter)
{
if (setter is Setter s && s.Property == ContextFlyoutProperty)
{
return; // Allow ContextFlyout to not need wrapping in <Template>
}
throw new InvalidOperationException(
"Cannot use a control as a Setter value. Wrap the control in a <Template>.");
}

5
src/Avalonia.Controls/Flyouts/Flyout.cs

@ -38,10 +38,11 @@ namespace Avalonia.Controls
{
if (FlyoutPresenterClasses != null)
{
//Remove any classes no longer in use
//Remove any classes no longer in use, ignoring any pseudoclasses
for (int i = _popup.Child.Classes.Count - 1; i >= 0; i--)
{
if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]))
if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]) &&
!_popup.Child.Classes[i].Contains(":"))
{
_popup.Child.Classes.RemoveAt(i);
}

5
src/Avalonia.Controls/Flyouts/MenuFlyout.cs

@ -58,10 +58,11 @@ namespace Avalonia.Controls
{
if (FlyoutPresenterClasses != null)
{
//Remove any classes no longer in use
//Remove any classes no longer in use, ignoring pseudoclasses
for (int i = _popup.Child.Classes.Count - 1; i >= 0; i--)
{
if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]))
if (!FlyoutPresenterClasses.Contains(_popup.Child.Classes[i]) &&
!_popup.Child.Classes[i].Contains(":"))
{
_popup.Child.Classes.RemoveAt(i);
}

Loading…
Cancel
Save