Meik/C4IT-F4SD-Client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git push Merge branch 'bugfix/esc-ticketdropdown-hang'

Browse Source
This commit is contained in:
Meik
2026-02-20 16:21:02 +01:00
parent dd0e7bdc99 e154353af8
commit 485a209a26
9 changed files with 3523 additions and 3605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
FasdDesktopUi/Basics/UserControls/Badge.xaml
View File

@@ -3,16 +3,16 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FasdDesktopUi.Basics.UserControls"
xmlns:ico="clr-namespace:FasdDesktopUi.Basics.UserControls.AdaptableIcon;assembly=F4SD-AdaptableIcon"
mc:Ignorable="d"
d:DesignHeight="20"
d:DesignWidth="40"
x:Name="BadgeControl"
Loaded="BadgeControl_Loaded"
Unloaded="BadgeControl_Unloaded">
x:Name="BadgeControl">
<Grid ClipToBounds="False">
<Border Background="{DynamicResource Color.SoftContrast}"
CornerRadius="5">
<StackPanel HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal"
@@ -22,51 +22,6 @@
Foreground="{DynamicResource FontColor.DetailsPage.DataHistory.Value}"
Text="{Binding ElementName=BadgeControl, Path=Text}" />
</StackPanel>
</Border>
<Canvas x:Name="SparkleCanvas"
IsHitTestVisible="False"
ClipToBounds="False"
Visibility="Collapsed">
<Grid x:Name="SparkleTopRight"
Canvas.Right="-3"
Canvas.Top="-4"
Opacity="0"
RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform>
<ScaleTransform ScaleX="0.6" ScaleY="0.6" />
</Grid.RenderTransform>
<Rectangle Width="2"
Height="8"
RadiusX="1"
RadiusY="1"
Fill="{DynamicResource FontColor.DetailsPage.DataHistory.Value}" />
<Rectangle Width="8"
Height="2"
RadiusX="1"
RadiusY="1"
Fill="{DynamicResource FontColor.DetailsPage.DataHistory.Value}" />
</Grid>
<Grid x:Name="SparkleBottomLeft"
Canvas.Left="-3"
Canvas.Bottom="-4"
Opacity="0"
RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform>
<ScaleTransform ScaleX="0.6" ScaleY="0.6" />
</Grid.RenderTransform>
<Rectangle Width="2"
Height="8"
RadiusX="1"
RadiusY="1"
Fill="{DynamicResource FontColor.DetailsPage.DataHistory.Value}" />
<Rectangle Width="8"
Height="2"
RadiusX="1"
RadiusY="1"
Fill="{DynamicResource FontColor.DetailsPage.DataHistory.Value}" />
</Grid>
</Canvas>
</Grid>
</UserControl>

116
FasdDesktopUi/Basics/UserControls/Badge.xaml.cs
View File

@@ -1,16 +1,10 @@
using System;
using System.Windows;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Animation;
namespace FasdDesktopUi.Basics.UserControls
{
public partial class Badge : UserControl
{
private readonly Storyboard _sparkleStoryboard;
private const double SparkleBaseScale = 0.6;
public string Text
{
get { return (string)GetValue(TextProperty); }
@@ -20,118 +14,10 @@ namespace FasdDesktopUi.Basics.UserControls
public static readonly DependencyProperty TextProperty =
DependencyProperty.Register(nameof(Text), typeof(string), typeof(Badge), new PropertyMetadata("Beta"));
public bool IsSparkleEnabled
{
get { return (bool)GetValue(IsSparkleEnabledProperty); }
set { SetValue(IsSparkleEnabledProperty, value); }
}
public static readonly DependencyProperty IsSparkleEnabledProperty =
DependencyProperty.Register(nameof(IsSparkleEnabled), typeof(bool), typeof(Badge), new PropertyMetadata(false, OnIsSparkleEnabledChanged));
public Badge()
{
InitializeComponent();
_sparkleStoryboard = CreateSparkleStoryboard();
UpdateSparkleState();
}
private static void OnIsSparkleEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
var control = d as Badge;
control?.UpdateSparkleState();
}
private void BadgeControl_Loaded(object sender, RoutedEventArgs e)
{
UpdateSparkleState();
}
private void BadgeControl_Unloaded(object sender, RoutedEventArgs e)
{
StopSparkles();
}
private void UpdateSparkleState()
{
if (SparkleCanvas == null || _sparkleStoryboard == null)
{
return;
}
if (IsSparkleEnabled)
{
SparkleCanvas.Visibility = Visibility.Visible;
_sparkleStoryboard.Begin(this, true);
return;
}
SparkleCanvas.Visibility = Visibility.Collapsed;
StopSparkles();
}
private void StopSparkles()
{
_sparkleStoryboard?.Stop(this);
if (SparkleTopRight != null)
{
SparkleTopRight.Opacity = 0;
if (SparkleTopRight.RenderTransform is ScaleTransform topTransform)
{
topTransform.ScaleX = SparkleBaseScale;
topTransform.ScaleY = SparkleBaseScale;
}
}
if (SparkleBottomLeft != null)
{
SparkleBottomLeft.Opacity = 0;
if (SparkleBottomLeft.RenderTransform is ScaleTransform bottomTransform)
{
bottomTransform.ScaleX = SparkleBaseScale;
bottomTransform.ScaleY = SparkleBaseScale;
}
}
}
private Storyboard CreateSparkleStoryboard()
{
var storyboard = new Storyboard
{
RepeatBehavior = RepeatBehavior.Forever
};
AddKeyFrames(storyboard, SparkleTopRight, "Opacity",
(0.00, 0.0), (0.18, 1.0), (0.42, 0.0), (2.20, 0.0));
AddKeyFrames(storyboard, SparkleTopRight, "(UIElement.RenderTransform).(ScaleTransform.ScaleX)",
(0.00, SparkleBaseScale), (0.22, 1.15), (0.42, SparkleBaseScale), (2.20, SparkleBaseScale));
AddKeyFrames(storyboard, SparkleTopRight, "(UIElement.RenderTransform).(ScaleTransform.ScaleY)",
(0.00, SparkleBaseScale), (0.22, 1.15), (0.42, SparkleBaseScale), (2.20, SparkleBaseScale));
AddKeyFrames(storyboard, SparkleBottomLeft, "Opacity",
(0.00, 0.0), (1.00, 0.0), (1.18, 1.0), (1.42, 0.0), (2.20, 0.0));
AddKeyFrames(storyboard, SparkleBottomLeft, "(UIElement.RenderTransform).(ScaleTransform.ScaleX)",
(0.00, SparkleBaseScale), (1.00, SparkleBaseScale), (1.22, 1.15), (1.42, SparkleBaseScale), (2.20, SparkleBaseScale));
AddKeyFrames(storyboard, SparkleBottomLeft, "(UIElement.RenderTransform).(ScaleTransform.ScaleY)",
(0.00, SparkleBaseScale), (1.00, SparkleBaseScale), (1.22, 1.15), (1.42, SparkleBaseScale), (2.20, SparkleBaseScale));
return storyboard;
}
private static void AddKeyFrames(Storyboard storyboard, DependencyObject target, string targetProperty, params (double TimeSeconds, double Value)[] frames)
{
var animation = new DoubleAnimationUsingKeyFrames();
foreach (var frame in frames)
{
animation.KeyFrames.Add(new LinearDoubleKeyFrame(frame.Value, KeyTime.FromTimeSpan(TimeSpan.FromSeconds(frame.TimeSeconds))));
}
Storyboard.SetTarget(animation, target);
Storyboard.SetTargetProperty(animation, new PropertyPath(targetProperty));
storyboard.Children.Add(animation);
}
}
}

20
FasdDesktopUi/Basics/UserControls/ComboBoxPageable.xaml.cs
View File

@@ -222,6 +222,15 @@ namespace FasdDesktopUi.Basics.UserControls
return null;
}
public bool CloseDropDownIfOpen()
{
if (ComboBoxControl?.IsDropDownOpen != true)
return false;
ComboBoxControl.IsDropDownOpen = false;
return true;
}
#region Paging Events
#region PageBack
@@ -316,6 +325,15 @@ namespace FasdDesktopUi.Basics.UserControls
}
}
private void SearchTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
{
if (e.Key != Key.Escape)
return;
if (CloseDropDownIfOpen())
e.Handled = true;
}
private void ComboBoxControl_DropDownClosed(object sender, EventArgs e)
{
timer.Stop();
@@ -384,6 +402,8 @@ namespace FasdDesktopUi.Basics.UserControls
TextBox searchTextBox = FindVisualChild<TextBox>(partPopup.Child, "SearchTextBox");
if (searchTextBox != null)
{
searchTextBox.PreviewKeyDown -= SearchTextBox_PreviewKeyDown;
searchTextBox.PreviewKeyDown += SearchTextBox_PreviewKeyDown;
// Setzen des Fokus auf TextBox
searchTextBox.Focus();
}

22
FasdDesktopUi/Basics/UserControls/HierarchicalSelectionControl.xaml.cs
View File

@@ -34,6 +34,15 @@ namespace FasdDesktopUi.Basics.UserControls
searchDelayTimer.Tick += SearchDelayTimer_Tick;
}
public bool CloseDropDownIfOpen()
{
if (ComboBoxControl?.IsDropDownOpen != true)
return false;
ComboBoxControl.IsDropDownOpen = false;
return true;
}
public override void OnApplyTemplate()
{
base.OnApplyTemplate();
@@ -345,6 +354,7 @@ namespace FasdDesktopUi.Basics.UserControls
if (treeViewControl != null)
{
treeViewControl.SelectedItemChanged += TreeViewControl_SelectedItemChanged;
treeViewControl.PreviewKeyDown += DropDownContent_PreviewKeyDown;
treeViewControl.ItemsSource = VisibleItems;
}
}
@@ -353,7 +363,10 @@ namespace FasdDesktopUi.Basics.UserControls
{
searchTextBox = ComboBoxControl.Template.FindName("PART_SearchTextBox", ComboBoxControl) as TextBox;
if (searchTextBox != null)
{
searchTextBox.TextChanged += SearchTextBox_TextChanged;
searchTextBox.PreviewKeyDown += DropDownContent_PreviewKeyDown;
}
}
if (itemsScrollViewer == null)
@@ -399,6 +412,15 @@ namespace FasdDesktopUi.Basics.UserControls
e.Handled = true;
}
private void DropDownContent_PreviewKeyDown(object sender, KeyEventArgs e)
{
if (e.Key != Key.Escape)
return;
if (CloseDropDownIfOpen())
e.Handled = true;
}
#endregion
#region Keyboard

4
FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml
View File

@@ -167,7 +167,9 @@
<Border Background="{DynamicResource BackgroundColor.DetailsPage.Widget.Title}"
CornerRadius="7.5"
Width="{Binding ElementName=TicketSelectionBorder, Path=ActualWidth}">
<StackPanel x:Name="TicketSelectionContainer" />
<StackPanel x:Name="TicketSelectionContainer"
Focusable="True"
PreviewKeyDown="TicketSelectionContainer_PreviewKeyDown" />
</Border>
</Popup>
</StackPanel>

39
FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml.cs
View File

@@ -2541,6 +2541,14 @@ namespace FasdDesktopUi.Basics.UserControls
DropDownOpened(TicketSelectionBorder, EventArgs.Empty);
TicketSelectionPopUp.IsOpen = !TicketSelectionPopUp.IsOpen;
if (TicketSelectionPopUp.IsOpen)
{
_ = Dispatcher.BeginInvoke((Action)(() =>
{
TicketSelectionContainer?.Focus();
Keyboard.Focus(TicketSelectionContainer);
}), System.Windows.Threading.DispatcherPriority.Input);
}
});
}
@@ -2554,6 +2562,15 @@ namespace FasdDesktopUi.Basics.UserControls
TicketSelectionBorder_Click();
}
private void TicketSelectionContainer_PreviewKeyDown(object sender, KeyEventArgs e)
{
if (e.Key != Key.Escape || TicketSelectionPopUp?.IsOpen != true)
return;
TicketSelectionPopUp.IsOpen = false;
e.Handled = true;
}
private void TicketSummaryTextBox_TextChanged(object sender, TextChangedEventArgs e)
{
try
@@ -2792,10 +2809,26 @@ namespace FasdDesktopUi.Basics.UserControls
private void Combobox_PreviewKeyDown(object sender, KeyEventArgs e)
{
if (e.Key == Key.Escape)
if (e.Key != Key.Escape)
return;
if (sender is ComboBoxPageable pageable && pageable.CloseDropDownIfOpen())
{
if (sender is FrameworkElement fe && IsInsidePageable(fe)) return;
DropDownClosed(sender, e);
e.Handled = true;
return;
}
if (sender is HierarchicalSelectionControl hierarchicalSelectionControl && hierarchicalSelectionControl.CloseDropDownIfOpen())
{
e.Handled = true;
return;
}
if (sender is ComboBox comboBox && comboBox.IsDropDownOpen)
{
comboBox.IsDropDownOpen = false;
e.Handled = true;
return;
}
}
}

1
FasdDesktopUi/Pages/SearchPage/SearchPageView.xaml
View File

@@ -120,7 +120,6 @@
FontWeight="Bold"
Visibility="Visible" />
<buc:Badge Margin="6 0 0 0"
IsSparkleEnabled="True"
VerticalAlignment="Center"
Text="Beta">
<buc:Badge.LayoutTransform>

2
FasdDesktopUi/Pages/TicketCompletion/TicketCompletion.xaml
View File

@@ -18,7 +18,7 @@
Background="Transparent"
WindowStartupLocation="CenterOwner"
DataContext="{Binding RelativeSource={RelativeSource Self}}"
PreviewKeyDown="CustomMessageBox_PreviewKeyDown"
KeyDown="CustomMessageBox_KeyDown"
IsVisibleChanged="BlurInvoker_IsActiveChanged">
<WindowChrome.WindowChrome>

11
FasdDesktopUi/Pages/TicketCompletion/TicketCompletion.xaml.cs
View File

@@ -280,14 +280,15 @@ namespace FasdDesktopUi.Pages.TicketCompletion
#endregion
private void CustomMessageBox_PreviewKeyDown(object sender, KeyEventArgs e)
private void CustomMessageBox_KeyDown(object sender, KeyEventArgs e)
{
switch (e.Key)
if (e.Key != Key.Escape)
{
case Key.Escape:
Close_Click();
break;
return;
}
Close_Click();
e.Handled = true;
}
private async Task DoCloseActionAsync()