Skip to content

Commit

Permalink
Try reverting these
Browse files Browse the repository at this point in the history
  • Loading branch information
mattleibow committed May 9, 2023
1 parent 27366b9 commit 31bfb34
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 16 deletions.
5 changes: 3 additions & 2 deletions src/Controls/src/Core/Layout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ public abstract class Layout : View, ILayout, ILayoutController, IPaddingElement

/// <summary>Bindable property for <see cref="CascadeInputTransparent"/>.</summary>
public static readonly BindableProperty CascadeInputTransparentProperty =
BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true,
propertyChanged: OnCascadeInputTransparentPropertyChanged);
BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true);
//BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true,
// propertyChanged: OnCascadeInputTransparentPropertyChanged);

/// <summary>Bindable property for <see cref="Padding"/>.</summary>
public static readonly BindableProperty PaddingProperty = PaddingElement.PaddingProperty;
Expand Down
14 changes: 3 additions & 11 deletions src/Controls/src/Core/Layout/Layout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,6 @@ protected virtual void OnAdd(int index, IView view)
{
NotifyHandler(nameof(ILayoutHandler.Add), index, view);

// Make sure CascadeInputTransparent is applied, if necessary
Handler?.UpdateValue(nameof(CascadeInputTransparent));

// Take care of the Element internal bookkeeping
if (view is Element element)
{
Expand Down Expand Up @@ -241,9 +238,6 @@ protected virtual void OnInsert(int index, IView view)
{
NotifyHandler(nameof(ILayoutHandler.Insert), index, view);

// Make sure CascadeInputTransparent is applied, if necessary
Handler?.UpdateValue(nameof(CascadeInputTransparent));

// Take care of the Element internal bookkeeping
if (view is Element element)
{
Expand All @@ -254,9 +248,6 @@ protected virtual void OnInsert(int index, IView view)
protected virtual void OnUpdate(int index, IView view, IView oldView)
{
NotifyHandler(nameof(ILayoutHandler.Update), index, view);

// Make sure CascadeInputTransparent is applied, if necessary
Handler?.UpdateValue(nameof(CascadeInputTransparent));
}

void NotifyHandler(string action, int index, IView view)
Expand Down Expand Up @@ -293,8 +284,9 @@ public Graphics.Size CrossPlatformArrange(Graphics.Rect bounds)

/// <summary>Bindable property for <see cref="CascadeInputTransparent"/>.</summary>
public static readonly BindableProperty CascadeInputTransparentProperty =
BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true,
propertyChanged: OnCascadeInputTransparentPropertyChanged);
BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true);
//BindableProperty.Create(nameof(CascadeInputTransparent), typeof(bool), typeof(Layout), true,
// propertyChanged: OnCascadeInputTransparentPropertyChanged);

public bool CascadeInputTransparent
{
Expand Down
7 changes: 4 additions & 3 deletions src/Controls/src/Core/VisualElement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ public partial class VisualElement : NavigableElement, IAnimatable, IVisualEleme
bool _inputTransparentExplicit = (bool)InputTransparentProperty.DefaultValue;

/// <summary>Bindable property for <see cref="InputTransparent"/>.</summary>
public static readonly BindableProperty InputTransparentProperty = BindableProperty.Create(
"InputTransparent", typeof(bool), typeof(VisualElement), default(bool),
propertyChanged: OnInputTransparentPropertyChanged, coerceValue: CoerceInputTransparentProperty);
public static readonly BindableProperty InputTransparentProperty = BindableProperty.Create("InputTransparent", typeof(bool), typeof(VisualElement), default(bool));
//public static readonly BindableProperty InputTransparentProperty = BindableProperty.Create(
// "InputTransparent", typeof(bool), typeof(VisualElement), default(bool),
// propertyChanged: OnInputTransparentPropertyChanged, coerceValue: CoerceInputTransparentProperty);

bool _isEnabledExplicit = (bool)IsEnabledProperty.DefaultValue;

Expand Down

0 comments on commit 31bfb34

Please sign in to comment.