Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,8 @@ bool IsElementVisibleInContainer(FrameworkElement element, FrameworkElement cont

default:
return elementBounds.Left < containerBounds.Right && elementBounds.Right > containerBounds.Left;
};
}
;
}

void OnScrollViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,8 @@ public override CGRect Frame
value.Width = (value.X - xSpace) + value.Width;
value.X = xSpace;
}
};
}
;

value.Height = ToolbarHeight;
}
Expand Down
6 changes: 4 additions & 2 deletions src/Controls/src/BindingSourceGen/PathParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ private Result<List<IPathPart>> HandleBinaryExpression(BinaryExpressionSyntax as
if (typeInfo == null)
{
return Result<List<IPathPart>>.Failure(DiagnosticsFactory.UnableToResolvePath(castTo.GetLocation()));
};
}
;

leftResult.Value.Add(new Cast(typeInfo.CreateTypeDescription(_enabledNullable)));

Expand All @@ -161,7 +162,8 @@ private Result<List<IPathPart>> HandleCastExpression(CastExpressionSyntax castEx
if (typeInfo == null)
{
return Result<List<IPathPart>>.Failure(DiagnosticsFactory.UnableToResolvePath(castExpression.GetLocation()));
};
}
;

result.Value.Add(new Cast(typeInfo.CreateTypeDescription(_enabledNullable)));

Expand Down
3 changes: 2 additions & 1 deletion src/Controls/src/Core/AppThemeBinding.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ void Set()
}
target.SetValueCore(_targetProperty, value, Internals.SetValueFlags.ClearDynamicResource, BindableObject.SetValuePrivateFlags.Default | BindableObject.SetValuePrivateFlags.Converted, specificity);
}
};
}
;
}

object _light;
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/src/Core/BindableLayout/BindableLayout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ static View CreateItemView(object item, DataTemplate dataTemplate)
return view;
}


static void ClearBindingContext(IView child)
{
if (child is BindableObject bindable && bindable.IsSet(BindableLayoutTemplateProperty))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1996,7 +1996,8 @@ public override CGRect Frame
value.Width = (value.X - xSpace) + value.Width;
value.X = xSpace;
}
};
}
;

value.Height = ToolbarHeight;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,8 @@ void RemoveAllButCurrent(Fragment skip)

trans ??= ChildFragmentManager.BeginTransactionEx();
trans.Remove(f);
};
}
;

trans?.CommitAllowingStateLossEx();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,8 @@ bool IsElementVisibleInContainer(FrameworkElement element, FrameworkElement cont

default:
return elementBounds.Left < containerBounds.Right && elementBounds.Right > containerBounds.Left;
};
}
;
}

async void ScrollToRequested(object sender, ScrollToRequestEventArgs args)
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ static NSCollectionLayoutBoundarySupplementaryItem[] CreateSupplementaryItems(La
scrollDirection == UICollectionViewScrollDirection.Vertical
? NSRectAlignment.Top
: NSRectAlignment.Leading));
};
}
;

if (layoutHeaderFooterInfo.HasFooter)
{
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/src/Core/Shell/ShellSection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,8 @@ void WaitForRendererToGetRemoved(object s, EventArgs p)
{
sc.Page.PlatformEnabledChanged -= WaitForRendererToGetRemoved;
base.OnChildRemoved(child, oldLogicalIndex);
};
}
;
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions src/Controls/tests/Core.UnitTests/BindableLayoutTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -665,15 +665,15 @@ public void DisconnectsHandlersWhenRemovingViews()
.ConfigureMauiHandlers(handlers => handlers.AddHandler<Button, HandlerStub>())
.ConfigureMauiHandlers(handlers => handlers.AddHandler<VerticalStackLayout, BindableLayoutHandlerStub>())
.Build();

MauiContext mauiContext = new MauiContext(mauiApp.Services);

var bindableLayout = new VerticalStackLayout();
var items = new ObservableCollection<int>(Enumerable.Range(0, 10));
BindableLayout.SetItemsSource(bindableLayout, items);
BindableLayout.SetItemTemplate(bindableLayout, new DataTemplate(() => new Button()));
BindableLayout.SetEmptyView(bindableLayout, new Button());

bindableLayout.ToHandler(mauiContext);

// Ensure we have the handlers on all elements
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/tests/Core.UnitTests/BindingUnitTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,8 @@ void create()
proxies.Add(new WeakReference(listener));
}
Assert.NotEmpty(proxies); // Should be at least 1
};
}
;
create();

await Task.Yield();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public async Task ContentSizeExpandsToViewport()
static CoreGraphics.CGSize getViewportSize(UIScrollView scrollView)
{
return scrollView.AdjustedContentInset.InsetRect(scrollView.Bounds).Size;
};
}
;

var scrollViewHandler = await InvokeOnMainThreadAsync(() =>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,8 @@ public async Task MovingBetweenMultiplePagesWithNestedNavigationPages(bool botto
{
Title = title
};
};
}
;

var tabbedPage = CreateBasicTabbedPage(bottomTabs, isSmoothScrollEnabled, pages);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static List<Post> GetData()
From = "Lorem ipsum"
};

for(int i = 0; i < 1000; i++)
for (int i = 0; i < 1000; i++)
{
posts.Add(new Post { Title = $"Lorem ipsum {i + 1} dolor sit amet, consectetur adipiscing elit", Image = "photo21314.jpg", Likes = "1k", User = user });
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ ContentPage CreateContentPage()

page.Content = layout;
return page;
};
}
;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class Issue26598 : _IssuesUITest
public override string Issue => "Tabbar disappears when navigating back from page with hidden TabBar in iOS";

#if ANDROID
const string back = "";
const string back = "";
#else
const string back = "InnerTab";
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/Controls/tests/TestCases.Shared.Tests/UITest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ public override void Reset()
/// </code>
/// </example>
public void VerifyScreenshotOrSetException(
ref Exception? exception,
string? name = null,
ref Exception? exception,
string? name = null,
TimeSpan? retryDelay = null
#if MACUITEST || WINTEST
, bool includeTitleBar = false
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/tests/Xaml.UnitTests/Issues/Maui6367.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Test
[Test]
public void NestedTriggers([Values(false, true)] bool useCompiledXaml)
{
Maui6367 view = new Maui6367(useCompiledXaml);
Maui6367 view = new Maui6367(useCompiledXaml);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/tests/Xaml.UnitTests/MSBuild/MSBuildTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ void onData(object s, DataReceivedEventArgs e)
builder.AppendLine(e.Data);
Console.WriteLine(e.Data);
}
};
}
;

var ext = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : "";
var dotnet = IOPath.Combine(testDirectory, "..", "..", "..", "..", "..", "..", "..", "bin", "dotnet", $"dotnet{ext}");
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Graphics/PaintExtensions.Android.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using Android.Content;
using Android.Content.Res;
using Android.Graphics.Drawables;
using AColor = Android.Graphics.Color;
using AOrientation = Android.Graphics.Drawables.GradientDrawable.Orientation;
using APaint = Android.Graphics.Paint;
using AColor = Android.Graphics.Color;

namespace Microsoft.Maui.Graphics
{
Expand Down
3 changes: 2 additions & 1 deletion src/Core/src/Handlers/Editor/EditorHandler.Tizen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ TSize IMeasurable.Measure(double availableWidth, double availableHeight)
else
{
return new TSize(Math.Max(PixelSize + 10, availableWidth), PixelSize + 10);
};
}
;
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/Core/src/Handlers/Entry/EntryHandler.Tizen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ TSize IMeasurable.Measure(double availableWidth, double availableHeight)
else
{
return new TSize(Math.Max(PixelSize + 10, availableWidth), PixelSize + 10);
};
}
;
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/Core/src/Platform/Android/ViewExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,8 @@ void ShowSoftInput()
}

view.ShowSoftInput();
};
}
;

view.Post(ShowSoftInput);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Android/WrapperView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ partial void ShadowChanged()
int[] colors;
float[] positions;
float[] bounds;

switch (shadowPaint)
{
case LinearGradientPaint linearGradientPaint:
Expand Down
3 changes: 2 additions & 1 deletion src/Core/src/Platform/Windows/SliderExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ void OnImageOpened(object sender, RoutedEventArgs e)

if (nativeSlider.Parent is FrameworkElement frameworkElement)
frameworkElement.InvalidateMeasure();
};
}
;
}

nativeSlider.ThumbImageSource = nativeThumbImageSource?.Value;
Expand Down
6 changes: 4 additions & 2 deletions src/Core/src/Platform/iOS/ViewExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,8 @@ void OnLoadedCheck(NSObservedChange? nSObservedChange = null)
uiView.BeginInvokeOnMainThread(() => OnLoadedCheck(null));
}
}
};
}
;

return disposable;
}
Expand Down Expand Up @@ -740,7 +741,8 @@ void UnLoadedCheck()
disposable = null;
action();
}
};
}
;

return disposable;
}
Expand Down