Fix to vertical column header

prs.desktop/App.xaml

@@ -213,10 +213,8 @@
                                         ContentTemplate="{TemplateBinding ContentTemplate}"
                                         ContentStringFormat="{TemplateBinding ContentStringFormat}" Focusable="False"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                        <ContentPresenter.Content>
-                                            <TextBlock Text="{Binding HeaderText}" TextWrapping="Wrap" />
-                                        </ContentPresenter.Content>
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Content="{TemplateBinding Content}">
                                     </ContentPresenter>
                                     <Grid x:Name="PART_SortButtonPresenter" Grid.Column="1" SnapsToDevicePixels="True">
                                         <Grid.ColumnDefinitions>

prs.server/App.xaml

@@ -89,10 +89,8 @@
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
                                 ContentStringFormat="{TemplateBinding ContentStringFormat}" Focusable="False"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                <ContentPresenter.Content>
-                                    <TextBlock Text="{Binding HeaderText}" TextWrapping="Wrap" />
-                                </ContentPresenter.Content>
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}">
                             </ContentPresenter>
                             <Grid x:Name="PART_SortButtonPresenter" Grid.Column="1" SnapsToDevicePixels="True">
                                 <Grid.ColumnDefinitions>