fix: Fix DatePicker on Windows (#1332)

unoplatform · Jan 24, 2024 · 5a164fd · 5a164fd
1 parent 6ce3ce8
commit 5a164fd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/src/library/Uno.Cupertino/CupertinoResources.cs b/src/library/Uno.Cupertino/CupertinoResources.cs
@@ -41,7 +41,7 @@ public CupertinoResources()
 				// "ms-appx:///Uno.Cupertino/Styles/Controls/ComboBox.xaml",
 				"CupertinoComboBoxStyle",
 				// "ms-appx:///Uno.Cupertino/Styles/Controls/DatePicker.xaml",
-				"CupertinoDatePickerStyle",
+				"CupertinoDatePickerStyle", "CupertinoDatePickerFlyoutPresenterStyle",
 				// "ms-appx:///Uno.Cupertino/Styles/Controls/HyperlinkButton.xaml",
 				"CupertinoHyperlinkButtonStyle",
 				// "ms-appx:///Uno.Cupertino/Styles/Controls/NumberBox.xaml",

diff --git a/src/library/Uno.Cupertino/Styles/Controls/DatePicker.xaml b/src/library/Uno.Cupertino/Styles/Controls/DatePicker.xaml
@@ -71,7 +71,7 @@
 		</Setter>
 	</Style>
 
-	<not_win:Style x:Key="CupertinoDatePickerFlyoutPresenterStyle"
+	<Style x:Key="CupertinoDatePickerFlyoutPresenterStyle"
 				   TargetType="DatePickerFlyoutPresenter">
 		<Setter Property="Width"
 				Value="296" />
@@ -191,7 +191,7 @@
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
-	</not_win:Style>
+	</Style>
 
 	<Style x:Key="CupertinoDatePickerStyle"
 		   TargetType="DatePicker">
@@ -236,6 +236,7 @@
 								HorizontalContentAlignment="Stretch"
 								IsEnabled="{TemplateBinding IsEnabled}"
 								Style="{StaticResource CupertinoDatePickerFlyoutButtonStyle}"
+								MinWidth="296"
 								UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}">
 
 							<Grid x:Name="FlyoutButtonContentGrid"

diff --git a/src/library/Uno.Material/Styles/Controls/v1/DatePicker.xaml b/src/library/Uno.Material/Styles/Controls/v1/DatePicker.xaml
@@ -73,7 +73,7 @@
 		</Setter>
 	</Style>
 
-	<not_win:Style x:Key="MaterialDatePickerFlyoutPresenterStyle"
+	<Style x:Key="MaterialDatePickerFlyoutPresenterStyle"
 				   TargetType="DatePickerFlyoutPresenter">
 		<Setter Property="Width"
 				Value="296" />
@@ -184,7 +184,7 @@
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
-	</not_win:Style>
+	</Style>
 
 	<Style x:Key="MaterialDatePickerStyle"
 		   TargetType="DatePicker">

diff --git a/src/library/Uno.Material/Styles/Controls/v2/DatePicker.xaml b/src/library/Uno.Material/Styles/Controls/v2/DatePicker.xaml
@@ -167,7 +167,7 @@
 		</Setter>
 	</Style>
 
-	<not_win:Style x:Key="MaterialDatePickerFlyoutPresenterStyle"
+	<Style x:Key="MaterialDatePickerFlyoutPresenterStyle"
 				   TargetType="DatePickerFlyoutPresenter">
 		<Setter Property="Width" Value="{ThemeResource DatePickerFlyoutPresenterWidth}" />
 		<Setter Property="MinWidth" Value="{ThemeResource DatePickerFlyoutPresenterMinWidth}" />
@@ -265,7 +265,7 @@
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
-	</not_win:Style>
+	</Style>
 
 	<Style x:Key="MaterialDatePickerStyle"
 		   TargetType="DatePicker">
@@ -290,6 +290,7 @@
 								HorizontalContentAlignment="Stretch"
 								IsEnabled="{TemplateBinding IsEnabled}"
 								Style="{StaticResource MaterialDatePickerFlyoutButtonStyle}"
+								MinWidth="{ThemeResource DatePickerFlyoutPresenterMinWidth}"
 								UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}">
 
 							<Grid x:Name="ContentButton"
@@ -390,4 +391,8 @@
 	<Style x:Key="MaterialDefaultDatePickerStyle"
 		   TargetType="DatePicker"
 		   BasedOn="{StaticResource MaterialDatePickerStyle}" />
+
+	<Style x:Key="MaterialDefaultDatePickerFlyoutPresenterStyle"
+		   TargetType="DatePickerFlyoutPresenter"
+		   BasedOn="{StaticResource MaterialDatePickerFlyoutPresenterStyle}" />
 </ResourceDictionary>
diff --git a/src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml b/src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml
@@ -18,6 +18,7 @@
 	<Style BasedOn="{StaticResource MaterialDefaultCommandBarStyle}" TargetType="CommandBar" />
 	<Style BasedOn="{StaticResource MaterialDefaultContentDialogStyle}" TargetType="ContentDialog" />
 	<Style BasedOn="{StaticResource MaterialDefaultDatePickerStyle}" TargetType="DatePicker" />
+	<Style BasedOn="{StaticResource MaterialDefaultDatePickerFlyoutPresenterStyle}" TargetType="DatePickerFlyoutPresenter" />
 	<Style BasedOn="{StaticResource MaterialDefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter" />
 	<Style BasedOn="{StaticResource MaterialDefaultHyperlinkButtonStyle}" TargetType="HyperlinkButton" />
 	<Style BasedOn="{StaticResource MaterialDefaultListViewItemStyle}" TargetType="ListViewItem" />
@@ -53,6 +54,7 @@
 	<StaticResource x:Key="ComboBoxStyle"						ResourceKey="MaterialComboBoxStyle"				/>
 	<StaticResource x:Key="CommandBarStyle"						ResourceKey="MaterialCommandBarStyle"			/>
 	<StaticResource x:Key="DatePickerStyle"						ResourceKey="MaterialDatePickerStyle"			/>
+	<StaticResource x:Key="DatePickerFlyoutPresenterStyle"		ResourceKey="MaterialDatePickerFlyoutPresenterStyle" />
 	<StaticResource x:Key="FilledButtonStyle"					ResourceKey="MaterialFilledButtonStyle"			/>
 	<StaticResource x:Key="FlyoutPresenterStyle"				ResourceKey="MaterialFlyoutPresenterStyle"		/>
 	<StaticResource x:Key="HyperlinkButtonStyle"				ResourceKey="MaterialHyperlinkButtonStyle"		/>