Remove CanvasPanel

This commit is contained in:
ClemensFischer 2023-01-22 16:05:16 +01:00
parent 22d5aadb9d
commit 3a9050676c
6 changed files with 10 additions and 75 deletions

View file

@ -17,7 +17,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="map:MapItem">
<map:CanvasPanel>
<Canvas>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal"/>
@ -54,20 +54,12 @@
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<!-- Path with transformed Geometry -->
<Path Fill="Red" Opacity="0.4" IsHitTestVisible="False">
<Path.Data>
<EllipseGeometry RadiusX="20" RadiusY="20"
Transform="{Binding MapTransform, RelativeSource={RelativeSource TemplatedParent}}"/>
</Path.Data>
</Path>
<!-- MapPath with Location, requires CanvasPanel parent to avoid clipping -->
<map:MapPath Stroke="Green" StrokeThickness="2" IsHitTestVisible="False"
Location="{TemplateBinding Location}">
<map:MapPath.Data>
<EllipseGeometry RadiusX="20" RadiusY="20"/>
</map:MapPath.Data>
</map:MapPath>
<Path x:Name="selectedPath" Fill="White" Opacity="0">
<Path.Data>
<EllipseGeometry RadiusX="12" RadiusY="12"/>
@ -78,10 +70,8 @@
<EllipseGeometry RadiusX="8" RadiusY="8"/>
</Path.Data>
</Path>
<Grid Canvas.Left="15" Canvas.Top="-8">
<TextBlock Margin="2,0,2,0" Text="{Binding Name}"/>
</Grid>
</map:CanvasPanel>
<TextBlock Margin="16,-9,0,0" Text="{Binding Name}"/>
</Canvas>
</ControlTemplate>
</Setter.Value>
</Setter>