CQ: Dialog fix

XTorLukas · XTorLukas · commit 5bef3476efce · 2024-11-18T13:08:30.000+01:00
diff --git a/src/Files.App/Dialogs/AddBranchDialog.xaml.cs b/src/Files.App/Dialogs/AddBranchDialog.xaml.cs
@@ -21,6 +21,7 @@ public AddBranchDialogViewModel ViewModel
 		public AddBranchDialog()
 		{
 			InitializeComponent();
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		public new async Task<DialogResult> ShowAsync() => (DialogResult)await base.ShowAsync();
diff --git a/src/Files.App/Dialogs/AddItemDialog.xaml.cs b/src/Files.App/Dialogs/AddItemDialog.xaml.cs
@@ -24,6 +24,7 @@ public AddItemDialogViewModel ViewModel
 		public AddItemDialog()
 		{
 			InitializeComponent();
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		public new async Task<DialogResult> ShowAsync()
diff --git a/src/Files.App/Dialogs/BulkRenameDialog.xaml.cs b/src/Files.App/Dialogs/BulkRenameDialog.xaml.cs
@@ -19,6 +19,7 @@ public BulkRenameDialogViewModel ViewModel
 		public BulkRenameDialog()
 		{
 			InitializeComponent();
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		public new async Task<DialogResult> ShowAsync()
diff --git a/src/Files.App/Dialogs/CreateArchiveDialog.xaml.cs b/src/Files.App/Dialogs/CreateArchiveDialog.xaml.cs
@@ -65,6 +65,7 @@ public CreateArchiveDialog()
 			InitializeComponent();
 
 			ViewModel.PropertyChanged += ViewModel_PropertyChanged;
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		public new Task<ContentDialogResult> ShowAsync()
diff --git a/src/Files.App/Dialogs/CreateShortcutDialog.xaml.cs b/src/Files.App/Dialogs/CreateShortcutDialog.xaml.cs
@@ -29,6 +29,7 @@ public CreateShortcutDialog()
 			{
 				Source = ShortcutTarget
 			});
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		private void CreateShortcutDialog_Closing(ContentDialog sender, ContentDialogClosingEventArgs args)
diff --git a/src/Files.App/Dialogs/CredentialDialog.xaml.cs b/src/Files.App/Dialogs/CredentialDialog.xaml.cs
@@ -21,6 +21,7 @@ public CredentialDialogViewModel ViewModel
 		public CredentialDialog()
 		{
 			InitializeComponent();
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		public new async Task<DialogResult> ShowAsync()
diff --git a/src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs b/src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs
@@ -22,6 +22,7 @@ public DecompressArchiveDialogViewModel ViewModel
 		public DecompressArchiveDialog()
 		{
 			InitializeComponent();
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
diff --git a/src/Files.App/Dialogs/DynamicDialog.xaml.cs b/src/Files.App/Dialogs/DynamicDialog.xaml.cs
@@ -34,6 +34,7 @@ public DynamicDialog(DynamicDialogViewModel dynamicDialogViewModel)
 
 			dynamicDialogViewModel.HideDialog = Hide;
 			ViewModel = dynamicDialogViewModel;
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
diff --git a/src/Files.App/Dialogs/ElevateConfirmDialog.xaml.cs b/src/Files.App/Dialogs/ElevateConfirmDialog.xaml.cs
@@ -23,6 +23,7 @@ public ElevateConfirmDialogViewModel ViewModel
 		public ElevateConfirmDialog()
 		{
 			InitializeComponent();
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		public new async Task<DialogResult> ShowAsync()
diff --git a/src/Files.App/Dialogs/FileTooLargeDialog.xaml.cs b/src/Files.App/Dialogs/FileTooLargeDialog.xaml.cs
@@ -20,6 +20,7 @@ public FileTooLargeDialogViewModel ViewModel
 		public FileTooLargeDialog()
 		{
 			InitializeComponent();
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		public new async Task<DialogResult> ShowAsync()
diff --git a/src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs b/src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs
@@ -32,6 +32,7 @@ public FilesystemOperationDialog()
 			InitializeComponent();
 
 			MainWindow.Instance.SizeChanged += Current_SizeChanged;
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		public new async Task<DialogResult> ShowAsync()
diff --git a/src/Files.App/Dialogs/GitHubLoginDialog.xaml.cs b/src/Files.App/Dialogs/GitHubLoginDialog.xaml.cs
@@ -29,6 +29,7 @@ public GitHubLoginDialogViewModel ViewModel
 		public GitHubLoginDialog()
 		{
 			InitializeComponent();
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		public new async Task<DialogResult> ShowAsync()
diff --git a/src/Files.App/Dialogs/ReleaseNotesDialog.xaml.cs b/src/Files.App/Dialogs/ReleaseNotesDialog.xaml.cs
@@ -23,6 +23,7 @@ public ReleaseNotesDialog()
 			InitializeComponent();
 
 			MainWindow.Instance.SizeChanged += Current_SizeChanged;
+			AppLanguageHelper.UpdateContextLayout(this);
 			UpdateDialogLayout();
 		}
 
diff --git a/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs b/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs
@@ -29,6 +29,7 @@ public ReorderSidebarItemsDialogViewModel ViewModel
 		public ReorderSidebarItemsDialog()
 		{
 			InitializeComponent();
+			AppLanguageHelper.UpdateContextLayout(this);
 		}
 
 		private async void MoveItemAsync(object sender, PointerRoutedEventArgs e)
diff --git a/src/Files.App/Helpers/FlowDirectionHelper.cs b/src/Files.App/Helpers/FlowDirectionHelper.cs
@@ -0,0 +1,43 @@
+﻿using Microsoft.UI.Xaml;
+
+namespace Files.App.Helpers
+{
+	public static class FlowDirectionHelper
+	{
+		public static bool GetForceLeftToRight(DependencyObject obj)
+			=> (bool)obj.GetValue(ForceLeftToRightProperty);
+
+		public static void SetForceLeftToRight(DependencyObject obj, bool value)
+			=> obj.SetValue(ForceLeftToRightProperty, value);
+
+		public static readonly DependencyProperty ForceLeftToRightProperty =
+			DependencyProperty.RegisterAttached(
+				"ForceLeftToRight",
+				typeof(bool),
+				typeof(FlowDirectionHelper),
+				new PropertyMetadata(false, OnForceLeftToRightChanged));
+
+		private static void OnForceLeftToRightChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			if (d is FrameworkElement element)
+			{
+				// Pokud je ForceLeftToRight true, nastavíme FlowDirection na LeftToRight
+				if ((bool)e.NewValue)
+				{
+					element.FlowDirection = FlowDirection.LeftToRight;
+
+					// Přidáme event handler pro změny FlowDirection
+					_ = element.RegisterPropertyChangedCallback(
+						FrameworkElement.FlowDirectionProperty,
+						(sender, dp) =>
+						{
+							if (GetForceLeftToRight(element))
+							{
+								element.FlowDirection = FlowDirection.LeftToRight;
+							}
+						});
+				}
+			}
+		}
+	}
+}
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
@@ -65,6 +65,8 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
 			UpdatePageLayout();
 			Window.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
 			Window.AppWindow.Changed += AppWindow_Changed;
+
+			AppLanguageHelper.SetCultureLayout(Window);
 		}
 
 		private int SetTitleBarDragRegion(InputNonClientPointerSource source, SizeInt32 size, double scaleFactor, Func<UIElement, RectInt32?, RectInt32> getScaledRect)

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public AddBranchDialogViewModel ViewModel`
`21`	`21`	`public AddBranchDialog()`
`22`	`22`	`{`
`23`	`23`	`InitializeComponent();`
	`24`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`public new async Task<DialogResult> ShowAsync() => (DialogResult)await base.ShowAsync();`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public AddItemDialogViewModel ViewModel`
`24`	`24`	`public AddItemDialog()`
`25`	`25`	`{`
`26`	`26`	`InitializeComponent();`
	`27`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`public new async Task<DialogResult> ShowAsync()`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public BulkRenameDialogViewModel ViewModel`
`19`	`19`	`public BulkRenameDialog()`
`20`	`20`	`{`
`21`	`21`	`InitializeComponent();`
	`22`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`public new async Task<DialogResult> ShowAsync()`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public CreateArchiveDialog()`
`65`	`65`	`InitializeComponent();`
`66`	`66`
`67`	`67`	`ViewModel.PropertyChanged += ViewModel_PropertyChanged;`
	`68`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`public new Task<ContentDialogResult> ShowAsync()`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public CreateShortcutDialog()`
`29`	`29`	`{`
`30`	`30`	`Source = ShortcutTarget`
`31`	`31`	`});`
	`32`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`private void CreateShortcutDialog_Closing(ContentDialog sender, ContentDialogClosingEventArgs args)`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public CredentialDialogViewModel ViewModel`
`21`	`21`	`public CredentialDialog()`
`22`	`22`	`{`
`23`	`23`	`InitializeComponent();`
	`24`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`public new async Task<DialogResult> ShowAsync()`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public DecompressArchiveDialogViewModel ViewModel`
`22`	`22`	`public DecompressArchiveDialog()`
`23`	`23`	`{`
`24`	`24`	`InitializeComponent();`
	`25`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public DynamicDialog(DynamicDialogViewModel dynamicDialogViewModel)`
`34`	`34`
`35`	`35`	`dynamicDialogViewModel.HideDialog = Hide;`
`36`	`36`	`ViewModel = dynamicDialogViewModel;`
	`37`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public ElevateConfirmDialogViewModel ViewModel`
`23`	`23`	`public ElevateConfirmDialog()`
`24`	`24`	`{`
`25`	`25`	`InitializeComponent();`
	`26`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`public new async Task<DialogResult> ShowAsync()`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public FileTooLargeDialogViewModel ViewModel`
`20`	`20`	`public FileTooLargeDialog()`
`21`	`21`	`{`
`22`	`22`	`InitializeComponent();`
	`23`	`+ AppLanguageHelper.UpdateContextLayout(this);`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`public new async Task<DialogResult> ShowAsync()`