From 876f8883d86c757acc8bba8fd868ab0b9a26c5fe Mon Sep 17 00:00:00 2001 From: "AzureAD\\KarthickMani" Date: Tue, 15 Dec 2020 14:05:39 +0530 Subject: [PATCH 1/2] WPF-55869 - Resource HeaderTemplate updated --- ResourceHeaderTemplateDemo/MainWindow.xaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ResourceHeaderTemplateDemo/MainWindow.xaml b/ResourceHeaderTemplateDemo/MainWindow.xaml index 0ed8d28..697a294 100644 --- a/ResourceHeaderTemplateDemo/MainWindow.xaml +++ b/ResourceHeaderTemplateDemo/MainWindow.xaml @@ -11,12 +11,12 @@ mc:Ignorable="d" Title="ResourceHeaderTemplateDemo" Height="600" Width="950" WindowStartupLocation="CenterScreen"> - - Day - Week - WorkWeek - Timeline - + + + + + @@ -27,14 +27,14 @@ - + + Height="55" Source="{Binding Data.ImageSource}" /> + Foreground="Black" Text="{Binding Data.Name}" /> @@ -64,8 +64,8 @@ HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,25,0"> - + From 8d20154f25717350695c7462192fe7812761d9dd Mon Sep 17 00:00:00 2001 From: "AzureAD\\KarthickMani" Date: Tue, 15 Dec 2020 14:27:03 +0530 Subject: [PATCH 2/2] WPF-55869 - ResourceHeaderTemplateselector sample updated. --- .../Helper/ResourceTemplateSelector.cs | 2 +- .../MainWindow.xaml | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ResourceHeaderTemplateSelectorDemo/Helper/ResourceTemplateSelector.cs b/ResourceHeaderTemplateSelectorDemo/Helper/ResourceTemplateSelector.cs index 569438d..9f6b54f 100644 --- a/ResourceHeaderTemplateSelectorDemo/Helper/ResourceTemplateSelector.cs +++ b/ResourceHeaderTemplateSelectorDemo/Helper/ResourceTemplateSelector.cs @@ -34,7 +34,7 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai if (schedule == null) return null; - if (schedule.ViewType != SchedulerViewType.Timeline) + if (schedule.ViewType == SchedulerViewType.Day || schedule.ViewType == SchedulerViewType.Week || schedule.ViewType == SchedulerViewType.WorkWeek) return DayViewResourceTemplate; else return TimelineViewResourceTemplate; diff --git a/ResourceHeaderTemplateSelectorDemo/MainWindow.xaml b/ResourceHeaderTemplateSelectorDemo/MainWindow.xaml index b56bce2..41bbe40 100644 --- a/ResourceHeaderTemplateSelectorDemo/MainWindow.xaml +++ b/ResourceHeaderTemplateSelectorDemo/MainWindow.xaml @@ -11,12 +11,12 @@ mc:Ignorable="d" Title="ResourceHeaderTemplateSelectorDemo" Height="600" Width="950" WindowStartupLocation="CenterScreen"> - - Day - Week - WorkWeek - Timeline - + + + + + @@ -27,14 +27,14 @@ - + + Height="55" Source="{Binding Data.ImageSource}" /> + Foreground="Black" Text="{Binding Data.Name}" /> @@ -42,18 +42,18 @@ - + + Source="{Binding Data.ImageSource}" /> + Text="{Binding Data.Name}"/> @@ -84,8 +84,8 @@ HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,25,0"> - +