Skip to content

Commit 8642565

Browse files
dotMortendotMorten
authored
The template override no longer works with the new popupviewer design (#688)
1 parent 6ff1851 commit 8642565

File tree

2 files changed

+2
-121
lines changed

2 files changed

+2
-121
lines changed

‎src/Toolkit/Toolkit.WPF/UI/Controls/UtilityNetworkTraceTool/UtilityNetworkTraceTool.Theme.xaml‎

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -624,68 +624,7 @@
624624
BorderThickness="0,1,0,0"
625625
Header="{internal:LocalizedString Key=UtilityNetworkTraceToolAssetDetails}"
626626
Style="{StaticResource UNTraceGroupBox}">
627-
<controls:PopupViewer Popup="{Binding Popup}">
628-
<controls:PopupViewer.Template>
629-
<ControlTemplate TargetType="{x:Type controls:PopupViewer}">
630-
<Border
631-
MinWidth="{TemplateBinding MinWidth}"
632-
MaxWidth="{TemplateBinding MaxWidth}"
633-
Margin="{TemplateBinding Margin}"
634-
Padding="{TemplateBinding Padding}"
635-
Background="{TemplateBinding Background}"
636-
BorderBrush="{TemplateBinding BorderBrush}"
637-
BorderThickness="{TemplateBinding BorderThickness}">
638-
<Grid DataContext="{TemplateBinding PopupManager}">
639-
<Grid.Resources>
640-
<internal:VisibilityConverter x:Key="VisibilityConverter" />
641-
<internal:HtmlToPlainTextConverter x:Key="HtmlToPlainTextConverter" />
642-
</Grid.Resources>
643-
<Grid.RowDefinitions>
644-
<RowDefinition Height="Auto" />
645-
<RowDefinition Height="*" />
646-
</Grid.RowDefinitions>
647-
<Grid Grid.Row="1">
648-
<ItemsControl ItemsSource="{Binding DisplayedFields}" Visibility="{Binding CustomDescriptionHtml, Converter={StaticResource VisibilityConverter}, ConverterParameter=Reverse}">
649-
<ItemsControl.ItemTemplate>
650-
<DataTemplate>
651-
<Grid>
652-
<Grid.ColumnDefinitions>
653-
<ColumnDefinition Width="*" />
654-
<ColumnDefinition Width="*" />
655-
</Grid.ColumnDefinitions>
656-
<TextBlock
657-
FontWeight="SemiBold"
658-
Foreground="Black"
659-
Text="{Binding Field.Label}"
660-
TextWrapping="Wrap" />
661-
<TextBox
662-
Grid.Column="1"
663-
Margin="0"
664-
Padding="0"
665-
Background="Transparent"
666-
BorderThickness="0"
667-
IsReadOnly="True"
668-
Text="{Binding FormattedValue, Mode=OneWay}"
669-
TextWrapping="Wrap" />
670-
</Grid>
671-
</DataTemplate>
672-
</ItemsControl.ItemTemplate>
673-
</ItemsControl>
674-
<TextBox
675-
Margin="0"
676-
Padding="0"
677-
Background="Transparent"
678-
BorderThickness="0"
679-
IsReadOnly="True"
680-
Text="{Binding CustomDescriptionHtml, Converter={StaticResource HtmlToPlainTextConverter}, Mode=OneWay}"
681-
TextWrapping="Wrap"
682-
Visibility="{Binding CustomDescriptionHtml, Converter={StaticResource VisibilityConverter}}" />
683-
</Grid>
684-
</Grid>
685-
</Border>
686-
</ControlTemplate>
687-
</controls:PopupViewer.Template>
688-
</controls:PopupViewer>
627+
<controls:PopupViewer Popup="{Binding Popup}" />
689628
</GroupBox>
690629
</StackPanel>
691630
</Border>

‎src/Toolkit/Toolkit.WinUI/UI/Controls/UtilityNetworkTraceTool/UtilityNetworkTraceTool.Theme.xaml‎

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -611,65 +611,7 @@
611611
BorderThickness="0,1,0,0"
612612
Header="{internal:LocalizedString Key=UtilityNetworkTraceToolAssetDetails}"
613613
Style="{StaticResource UNTraceGroupBox}">
614-
<controls:PopupViewer Popup="{Binding Popup}">
615-
<controls:PopupViewer.Template>
616-
<ControlTemplate TargetType="controls:PopupViewer">
617-
<Border
618-
MinWidth="{TemplateBinding MinWidth}"
619-
MaxWidth="{TemplateBinding MaxWidth}"
620-
Margin="{TemplateBinding Margin}"
621-
Padding="{TemplateBinding Padding}"
622-
Background="{TemplateBinding Background}"
623-
BorderBrush="{TemplateBinding BorderBrush}"
624-
BorderThickness="{TemplateBinding BorderThickness}">
625-
<Grid DataContext="{TemplateBinding PopupManager}">
626-
<Grid.Resources>
627-
<internal:VisibilityConverter x:Key="VisibilityConverter" />
628-
<internal:HtmlToPlainTextConverter x:Key="HtmlToPlainTextConverter" />
629-
</Grid.Resources>
630-
<Grid.RowDefinitions>
631-
<RowDefinition Height="Auto" />
632-
<RowDefinition Height="*" />
633-
</Grid.RowDefinitions>
634-
<Grid Grid.Row="1">
635-
<ItemsControl ItemsSource="{Binding DisplayedFields}" Visibility="{Binding CustomDescriptionHtml, Converter={StaticResource VisibilityConverter}, ConverterParameter=Reverse}">
636-
<ItemsControl.ItemTemplate>
637-
<DataTemplate>
638-
<Grid Margin="0,0,0,2">
639-
<Grid.ColumnDefinitions>
640-
<ColumnDefinition Width="*" />
641-
<ColumnDefinition Width="*" />
642-
</Grid.ColumnDefinitions>
643-
<TextBlock
644-
FontWeight="SemiBold"
645-
Text="{Binding Field.Label}"
646-
TextWrapping="Wrap" />
647-
<TextBox
648-
Grid.Column="1"
649-
Margin="0"
650-
Padding="0"
651-
Background="Transparent"
652-
BorderThickness="0"
653-
Text="{Binding FormattedValue, Mode=OneWay}"
654-
TextWrapping="Wrap" />
655-
</Grid>
656-
</DataTemplate>
657-
</ItemsControl.ItemTemplate>
658-
</ItemsControl>
659-
<TextBox
660-
Margin="0"
661-
Padding="0"
662-
Background="Transparent"
663-
BorderThickness="0"
664-
Text="{Binding CustomDescriptionHtml, Converter={StaticResource HtmlToPlainTextConverter}, Mode=OneWay}"
665-
TextWrapping="Wrap"
666-
Visibility="{Binding CustomDescriptionHtml, Converter={StaticResource VisibilityConverter}}" />
667-
</Grid>
668-
</Grid>
669-
</Border>
670-
</ControlTemplate>
671-
</controls:PopupViewer.Template>
672-
</controls:PopupViewer>
614+
<controls:PopupViewer Popup="{Binding Popup}" />
673615
</internal:GroupBox>
674616
</StackPanel>
675617
</Border>

0 commit comments

Comments
 (0)