huanld/Speckle.Material.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply fix for issue #172

Browse Source
This commit is contained in:
appleneko2001
2022-07-04 18:50:13 +09:00
parent fa67ad7bda
commit 7376ff8560
2 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Material.Styles/Converters/AutoCorrectPositionConverter.cs
+41 -34
View File
@@ -2,60 +2,67 @@
using System.Collections.Generic;
using System.Globalization;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Data.Converters;
using Avalonia.Media;
using Avalonia.Media.Transformation;
using Avalonia.VisualTree;
namespace Material.Styles.Converters
{
public class AutoCorrectPositionConverter : IValueConverter
public class AutoCorrectPositionConverter : IMultiValueConverter
{
public static readonly Transform Empty = new MatrixTransform();
public static double DefaultOffsetY = 0;
private static double GetOffLeft(Rect bounds, double offsetX) => offsetX;
private static double GetOffLeft(double offsetX) => offsetX;
private static double GetOffRight(Rect bounds, double windowW, double offsetX) => offsetX + (bounds.Width) - windowW;
private static Vector GetTranslate(TransformedBounds bounds)
private static double GetOffRight(Rect bounds, double clipW, double offsetX)
{
return new Vector(bounds.Transform.M31, bounds.Transform.M32);
var r = offsetX + bounds.Width;
return Math.Max(0, r - clipW);
}
private Vector _prevCorrect = Vector.One;
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
private static Vector GetTranslate(Matrix m)
{
return Matrix.TryDecomposeTransform(m, out var decomposed) ?
decomposed.Translate : Vector.Zero;
}
public object Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
{
var transformedBounds = value as TransformedBounds?;
double offsetX = 0;
if (transformedBounds.HasValue)
{
var bounds = transformedBounds.Value;
if (values.Count <= 1 || values.Count > 2)
return Empty;
if (values[1] is not Rect clip)
return Empty;
if (values[0] is not TransformedBounds postTransformations)
return Empty;
var t = postTransformations.Transform;
var b = postTransformations.Bounds;
var c = clip;
var translate = GetTranslate(bounds);
var translate = GetTranslate(t);
var left = GetOffLeft(bounds.Bounds, translate.X - _prevCorrect.X);
var right = GetOffRight(bounds.Bounds, bounds.Clip.Width, translate.X- _prevCorrect.X);
var left = GetOffLeft(translate.X);
var right = GetOffRight(b, c.Width, translate.X);
if (left < 0)
{
offsetX = -left;
//_prevCorrect = new Vector(offsetX, DefaultOffsetY);
}
else if (right > 0)
{
offsetX = -right;
// _prevCorrect = new Vector(offsetX, DefaultOffsetY);
}
if (left < 0)
{
offsetX = -left;
//_prevCorrect = new Vector(offsetX, DefaultOffsetY);
}
else if (right > 0)
{
offsetX = -right;
// _prevCorrect = new Vector(offsetX, DefaultOffsetY);
}
return new TranslateTransform(offsetX, DefaultOffsetY);
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}
Material.Styles/Slider.xaml
+7 -2
View File
@@ -437,8 +437,13 @@
Margin="{Binding Margin, ElementName=InnerBubbleText}" Foreground="Transparent"/>
</Border>
<Border Name="PART_ContentContainer" Background="{DynamicResource MaterialDesignToolTipBackground}"
Padding="4, 8" CornerRadius="2" RenderTransform="{Binding TransformedBounds,
ElementName=PART_Positioner, Converter={StaticResource AutoCorrectPositionConverter}}">
Padding="4, 8" CornerRadius="2" >
<Border.RenderTransform>
<MultiBinding Converter="{StaticResource AutoCorrectPositionConverter}">
<Binding ElementName="PART_Positioner" Path="TransformedBounds"/>
<Binding Path="$parent[TopLevel].Bounds"/>
</MultiBinding>
</Border.RenderTransform>
<TextBlock Name="InnerBubbleText" Classes="Caption" Text="{Binding $parent[Slider].Value}"
Foreground="{DynamicResource MaterialDesignBackground}"/>