diff --git a/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml b/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml index 8828185..4a3c32b 100644 --- a/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml +++ b/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml @@ -179,7 +179,7 @@ Style="{StaticResource MandatoryFieldBorderStyle}"> cFasdCockpitConfig.Instance?.Global?.TicketConfiguration?.NotesMandatory ?? false; @@ -2484,10 +2487,15 @@ namespace FasdDesktopUi.Basics.UserControls if (defaultCategoryBorderBrush == null) defaultCategoryBorderBrush = CategoryValidationBorder.BorderBrush?.CloneCurrentValue(); + if (defaultCategoryBorderThickness == null) + defaultCategoryBorderThickness = CategoryValidationBorder.BorderThickness; CategoryValidationBorder.BorderBrush = hasError ? validationErrorBrush : defaultCategoryBorderBrush; + CategoryValidationBorder.BorderThickness = hasError + ? new Thickness(1) + : defaultCategoryBorderThickness ?? new Thickness(0); } private void UpdateQuickTicketValidationVisualState(bool hasError) @@ -2497,10 +2505,15 @@ namespace FasdDesktopUi.Basics.UserControls if (defaultQuickTicketBorderBrush == null) defaultQuickTicketBorderBrush = QuickTicketValidationBorder.BorderBrush?.CloneCurrentValue(); + if (defaultQuickTicketBorderThickness == null) + defaultQuickTicketBorderThickness = QuickTicketValidationBorder.BorderThickness; QuickTicketValidationBorder.BorderBrush = hasError ? validationErrorBrush : defaultQuickTicketBorderBrush; + QuickTicketValidationBorder.BorderThickness = hasError + ? new Thickness(1) + : defaultQuickTicketBorderThickness ?? new Thickness(0); } private void UpdateTicketStatusValidationVisualState(bool hasError) @@ -2510,10 +2523,15 @@ namespace FasdDesktopUi.Basics.UserControls if (defaultTicketStatusBorderBrush == null) defaultTicketStatusBorderBrush = TicketStatusValidationBorder.BorderBrush?.CloneCurrentValue(); + if (defaultTicketStatusBorderThickness == null) + defaultTicketStatusBorderThickness = TicketStatusValidationBorder.BorderThickness; TicketStatusValidationBorder.BorderBrush = hasError ? validationErrorBrush : defaultTicketStatusBorderBrush; + TicketStatusValidationBorder.BorderThickness = hasError + ? new Thickness(1) + : defaultTicketStatusBorderThickness ?? new Thickness(0); } diff --git a/FasdDesktopUi/Basics/UserControls/Ticket/CloseTicketDialog.xaml b/FasdDesktopUi/Basics/UserControls/Ticket/CloseTicketDialog.xaml index 8d87363..4f674ec 100644 --- a/FasdDesktopUi/Basics/UserControls/Ticket/CloseTicketDialog.xaml +++ b/FasdDesktopUi/Basics/UserControls/Ticket/CloseTicketDialog.xaml @@ -23,7 +23,7 @@ @@ -38,7 +38,7 @@ Style="{StaticResource MandatoryFieldBorderStyle}"> diff --git a/FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml.cs b/FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml.cs index 622a7ae..ac6e2f9 100644 --- a/FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml.cs +++ b/FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml.cs @@ -26,6 +26,8 @@ namespace FasdDesktopUi.Basics.UserControls private Brush defaultRoleBorderBrush; private Brush defaultPersonBorderBrush; + private Thickness? defaultRoleBorderThickness; + private Thickness? defaultPersonBorderThickness; string lastPersonSearch = string.Empty; string lastRoleSearch = string.Empty; @@ -89,6 +91,8 @@ namespace FasdDesktopUi.Basics.UserControls _dataProvider = dataProvider; defaultRoleBorderBrush = RoleValidationBorder?.BorderBrush?.CloneCurrentValue(); defaultPersonBorderBrush = PersonValidationBorder?.BorderBrush?.CloneCurrentValue(); + defaultRoleBorderThickness = RoleValidationBorder?.BorderThickness; + defaultPersonBorderThickness = PersonValidationBorder?.BorderThickness; UpdateResponsibleSelectionValidationState(true); } @@ -216,7 +220,10 @@ namespace FasdDesktopUi.Basics.UserControls { if (defaultRoleBorderBrush == null) defaultRoleBorderBrush = RoleValidationBorder.BorderBrush?.CloneCurrentValue(); + if (defaultRoleBorderThickness == null) + defaultRoleBorderThickness = RoleValidationBorder.BorderThickness; RoleValidationBorder.BorderBrush = hasError ? ValidationBrush : defaultRoleBorderBrush; + RoleValidationBorder.BorderThickness = hasError ? new Thickness(1) : defaultRoleBorderThickness ?? new Thickness(0); } if (PersonValidationBorder != null) @@ -224,6 +231,9 @@ namespace FasdDesktopUi.Basics.UserControls if (defaultPersonBorderBrush == null) defaultPersonBorderBrush = PersonValidationBorder.BorderBrush?.CloneCurrentValue(); PersonValidationBorder.BorderBrush = hasError ? ValidationBrush : defaultPersonBorderBrush; + if (defaultPersonBorderThickness == null) + defaultPersonBorderThickness = PersonValidationBorder.BorderThickness; + PersonValidationBorder.BorderThickness = hasError ? new Thickness(1) : defaultPersonBorderThickness ?? new Thickness(0); } } catch (Exception E) diff --git a/FasdDesktopUi/ResourceDictionaries/DetailsPageResources/CustomizableResources.xaml b/FasdDesktopUi/ResourceDictionaries/DetailsPageResources/CustomizableResources.xaml index 6335400..2a9a556 100644 --- a/FasdDesktopUi/ResourceDictionaries/DetailsPageResources/CustomizableResources.xaml +++ b/FasdDesktopUi/ResourceDictionaries/DetailsPageResources/CustomizableResources.xaml @@ -52,7 +52,7 @@ + Value="0" />