Skip to content

Commit 1f3048e

Browse files
committed
Attempt to fix rare MeasureOverride crash (pt. 2)
1 parent af96315 commit 1f3048e

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<pages:UrlToCachedImageSourceConverter x:Key="UrlToCachedImageSourceConverter" />
4646
<pages:FileSizeToStringLiteralConverter x:Key="FileSizeToStringLiteralConverter" />
4747
<pages:BooleanToOpacityConverter x:Key="BooleanToOpacityConverter" />
48-
<pages:FloorFloatingValueConverter x:Key="FloorFloatingValueConverter" />
48+
<pages:PercentageValueConverter x:Key="PercentageValueConverter" />
4949
</Page.Resources>
5050
<Grid x:Name="FrameGrid"
5151
Margin="32,8,32,32"
@@ -925,7 +925,7 @@
925925
FontWeight="Bold"
926926
HorizontalTextAlignment="Center"
927927
TextAlignment="Center">
928-
<Run Text="{Binding Progress.ProgressAllPercentage, Mode=OneWay, Converter={StaticResource FloorFloatingValueConverter}, FallbackValue='-'}" />
928+
<Run Text="{Binding Progress.ProgressAllPercentage, Mode=OneWay, Converter={StaticResource PercentageValueConverter}, FallbackValue='-'}" />
929929
<Run Text="%" />
930930
</TextBlock>
931931
</Grid>

CollapseLauncher/XAMLs/MainApp/ValueConverters.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
439439

440440
public partial class FloorFloatingValueConverter : IValueConverter
441441
{
442-
public object Convert(object value, Type targetType, object parameter, string language)
442+
public virtual object Convert(object value, Type targetType, object parameter, string language)
443443
{
444444
double valEvaluated = Math.Floor((double)value);
445445
if (!double.IsFinite(valEvaluated) ||
@@ -458,6 +458,15 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
458458
}
459459
}
460460

461+
public partial class PercentageValueConverter : FloorFloatingValueConverter
462+
{
463+
public override object Convert(object value, Type targetType, object parameter, string language)
464+
{
465+
double result = (double)base.Convert(value, targetType, parameter, language);
466+
return $"{result}%";
467+
}
468+
}
469+
461470
/*
462471
public partial class LocaleCodeToFlagUrlConverter : IValueConverter
463472
{

0 commit comments

Comments
 (0)