Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

[housekeeping] Automated PR to fix formatting errors #15057

Merged
merged 1 commit into from
Jan 17, 2022
Merged
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 @@ -37,7 +37,7 @@ protected override void Init()
CultureInfo.CurrentUICulture = culture;
}
};

var textLabel2 = new Label
{
Text = "Resolved Binding Value:"
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Controls/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public Page CreateDefaultMainPage()
Flyout = CoreGallery.GetFlyoutPage(),
Detail = CoreGallery.GetMainPage()
};

mdp.SetAutomationPropertiesName("Main page");
mdp.SetAutomationPropertiesHelpText("Main page help text");
mdp.Flyout.IconImageSource.SetAutomationPropertiesHelpText("This as MDP icon");
Expand Down
5 changes: 3 additions & 2 deletions Xamarin.Forms.Core/BindingExpression.cs
Original file line number Diff line number Diff line change
Expand Up @@ -455,14 +455,15 @@ internal static bool TryConvert(ref object value, BindableProperty targetPropert
}

object original = value;
try
try
{
convertTo = Nullable.GetUnderlyingType(convertTo) ?? convertTo;

var stringValue = value as string ?? string.Empty;
// see: https://bugzilla.xamarin.com/show_bug.cgi?id=32871
// do not canonicalize "*.[.]"; "1." should not update bound BindableProperty
if (stringValue.EndsWith(CultureInfo.CurrentUICulture.NumberFormat.NumberDecimalSeparator, StringComparison.Ordinal) && DecimalTypes.Contains(convertTo)) {
if (stringValue.EndsWith(CultureInfo.CurrentUICulture.NumberFormat.NumberDecimalSeparator, StringComparison.Ordinal) && DecimalTypes.Contains(convertTo))
{
value = original;
return false;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System;
using System.Linq;
using System.ComponentModel;
using System.Linq;
using Cairo;
using Xamarin.Forms.Platform.GTK.Controls;
using Xamarin.Forms.Platform.GTK.Extensions;
using Xamarin.Forms.PlatformConfiguration.GTKSpecific;
using Xamarin.Forms.Shapes;
using Cairo;

namespace Xamarin.Forms.Platform.GTK.Renderers
{
Expand Down