enhance: optimized Poptip

This commit is contained in:
NaBian committed 2022-03-10 13:53:57 +08:00
1 parent 7f19117c31
commit 508dfc0cf8
4 files changed
+61 -54

No files matched your search

@@ -9985,7 +9985,6 @@
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" /> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="Offset" Value="6" />
<Setter Property="Background" Value="{DynamicResource RegionBrush}" /> <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" /> <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
@@ -18,7 +18,8 @@ namespace HandyControl.Controls
_popup = new Popup _popup = new Popup
{ {
AllowsTransparency = true, AllowsTransparency = true,
Child = this Child = this,
Placement = PlacementMode.Relative
}; };
_popup.SetBinding(DataContextProperty, new Binding(DataContextProperty.Name) { Source = this }); _popup.SetBinding(DataContextProperty, new Binding(DataContextProperty.Name) { Source = this });
@@ -91,19 +92,42 @@ namespace HandyControl.Controls
set => SetValue(ContentTemplateSelectorProperty, value); set => SetValue(ContentTemplateSelectorProperty, value);
} }
public static readonly DependencyProperty OffsetProperty = DependencyProperty.RegisterAttached( public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.RegisterAttached(
"Offset", typeof(double), typeof(Poptip), new PropertyMetadata(6.0)); "VerticalOffset", typeof(double), typeof(Poptip), new PropertyMetadata(ValueBoxes.Double0Box));
public static void SetOffset(DependencyObject element, double value) public static void SetVerticalOffset(DependencyObject element, double value)
=> element.SetValue(OffsetProperty, value);
public static double GetOffset(DependencyObject element)
=> (double) element.GetValue(OffsetProperty);
public double Offset
{ {
get => (double) GetValue(OffsetProperty); element.SetValue(VerticalOffsetProperty, value);
set => SetValue(OffsetProperty, value); }
public static double GetVerticalOffset(DependencyObject element)
{
return (double) element.GetValue(VerticalOffsetProperty);
}
public double VerticalOffset
{
get => (double) GetValue(VerticalOffsetProperty);
set => SetValue(VerticalOffsetProperty, value);
}
public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.RegisterAttached(
"HorizontalOffset", typeof(double), typeof(Poptip), new PropertyMetadata(ValueBoxes.Double0Box));
public static void SetHorizontalOffset(DependencyObject element, double value)
{
element.SetValue(HorizontalOffsetProperty, value);
}
public static double GetHorizontalOffset(DependencyObject element)
{
return (double) element.GetValue(HorizontalOffsetProperty);
}
public double HorizontalOffset
{
get => (double) GetValue(HorizontalOffsetProperty);
set => SetValue(HorizontalOffsetProperty, value);
} }
public static readonly DependencyProperty PlacementTypeProperty = DependencyProperty.RegisterAttached( public static readonly DependencyProperty PlacementTypeProperty = DependencyProperty.RegisterAttached(
@@ -193,75 +217,60 @@ namespace HandyControl.Controls
var poptip = (Poptip) GetInstance(Target); var poptip = (Poptip) GetInstance(Target);
var popupPlacement = poptip.PlacementType; var popupPlacement = poptip.PlacementType;
var popupOffset = poptip.Offset; var popupOffsetX = poptip.HorizontalOffset;
var popupOffsetY = poptip.VerticalOffset;
PlacementMode placementMode;
switch (popupPlacement) switch (popupPlacement)
{ {
case PlacementType.LeftTop: case PlacementType.LeftTop:
offsetX = -popupOffset;
placementMode = PlacementMode.Left;
break; break;
case PlacementType.Left: case PlacementType.Left:
offsetX = -popupOffset; offsetY = -(height - targetHeight) * 0.5;
offsetY = (targetHeight - height) / 2;
placementMode = PlacementMode.Left;
break; break;
case PlacementType.LeftBottom: case PlacementType.LeftBottom:
offsetX = -popupOffset; offsetY = -(height - targetHeight);
offsetY = targetHeight - height;
placementMode = PlacementMode.Left;
break; break;
case PlacementType.TopLeft: case PlacementType.TopLeft:
offsetY = -popupOffset; offsetX = width;
placementMode = PlacementMode.Top; offsetY = -height;
break; break;
case PlacementType.Top: case PlacementType.Top:
offsetX = (targetWidth - width) / 2; offsetX = (width + targetWidth) * 0.5;
offsetY = -popupOffset; offsetY = -height;
placementMode = PlacementMode.Top;
break; break;
case PlacementType.TopRight: case PlacementType.TopRight:
offsetX = targetWidth - width; offsetX = targetWidth;
offsetY = -popupOffset; offsetY = -height;
placementMode = PlacementMode.Top;
break; break;
case PlacementType.RightTop: case PlacementType.RightTop:
offsetX = popupOffset; offsetX = width + targetWidth;
placementMode = PlacementMode.Right;
break; break;
case PlacementType.Right: case PlacementType.Right:
offsetX = popupOffset; offsetX = width + targetWidth;
offsetY = (targetHeight - height) / 2; offsetY = -(height - targetHeight) * 0.5;
placementMode = PlacementMode.Right;
break; break;
case PlacementType.RightBottom: case PlacementType.RightBottom:
offsetX = popupOffset; offsetX = width + targetWidth;
offsetY = targetHeight - height; offsetY = -(height - targetHeight);
placementMode = PlacementMode.Right;
break; break;
case PlacementType.BottomLeft: case PlacementType.BottomLeft:
offsetY = popupOffset; offsetX = width;
placementMode = PlacementMode.Bottom; offsetY = targetHeight;
break; break;
case PlacementType.Bottom: case PlacementType.Bottom:
offsetX = (targetWidth - width) / 2; offsetX = (width + targetWidth) * 0.5;
offsetY = popupOffset; offsetY = targetHeight;
placementMode = PlacementMode.Bottom;
break; break;
case PlacementType.BottomRight: case PlacementType.BottomRight:
offsetX = targetWidth - width; offsetX = targetWidth;
offsetY = popupOffset; offsetY = targetHeight;
placementMode = PlacementMode.Bottom;
break; break;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }
_popup.HorizontalOffset = offsetX; _popup.HorizontalOffset = offsetX + popupOffsetX;
_popup.VerticalOffset = offsetY; _popup.VerticalOffset = offsetY + popupOffsetY;
_popup.Placement = placementMode;
} }
private void SwitchPoptip(bool isShow) private void SwitchPoptip(bool isShow)
@@ -273,7 +282,8 @@ namespace HandyControl.Controls
SetCurrentValue(ContentProperty, GetContent(Target)); SetCurrentValue(ContentProperty, GetContent(Target));
SetCurrentValue(PlacementTypeProperty, GetPlacement(Target)); SetCurrentValue(PlacementTypeProperty, GetPlacement(Target));
SetCurrentValue(HitModeProperty, GetHitMode(Target)); SetCurrentValue(HitModeProperty, GetHitMode(Target));
SetCurrentValue(OffsetProperty, GetOffset(Target)); SetCurrentValue(HorizontalOffsetProperty, GetHorizontalOffset(Target));
SetCurrentValue(VerticalOffsetProperty, GetVerticalOffset(Target));
SetCurrentValue(IsOpenProperty, GetIsOpen(Target)); SetCurrentValue(IsOpenProperty, GetIsOpen(Target));
} }
@@ -7,7 +7,6 @@
<Setter Property="HorizontalAlignment" Value="Left"/> <Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Top"/> <Setter Property="VerticalAlignment" Value="Top"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Setter Property="Offset" Value="6"/>
<Setter Property="Background" Value="{DynamicResource RegionBrush}"/> <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/> <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/> <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
@@ -10103,7 +10103,6 @@
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" /> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="Offset" Value="6" />
<Setter Property="Background" Value="{DynamicResource RegionBrush}" /> <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" /> <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />