Esc schließt Popup

This commit is contained in:
2026-06-02 15:02:27 +02:00
parent b546e77ba5
commit 168a36ebb5
6 changed files with 27 additions and 9 deletions

View File

@@ -181,6 +181,9 @@ namespace BeWo.Services
private void Show(string title, Control control, WindowViewModel windowViewModel, BeWoWindowOptions options)
{
if(control.Focusable)
control.Focus();
if (options.ShowAsModal)
{
var modal = _windowFactory.GetModalViewWindow(title, control, options.Height, options.Width);

View File

@@ -13,7 +13,11 @@
Height="auto"
d:DataContext="{d:DesignInstance Type=viewmodel:AiPromptbausteinFolderViewModel}"
Background="{StaticResource ObjectEditBackgroundBrush}"
Focusable="True"
mc:Ignorable="d">
<UserControl.InputBindings>
<KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
</UserControl.InputBindings>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>

View File

@@ -13,7 +13,11 @@
Height="auto"
d:DataContext="{d:DesignInstance Type=viewmodel:AiPromptbausteinPromptViewModel}"
Background="{StaticResource ObjectEditBackgroundBrush}"
mc:Ignorable="d">
mc:Ignorable="d"
Focusable="True">
<UserControl.InputBindings>
<KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
</UserControl.InputBindings>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>

View File

@@ -12,7 +12,11 @@
x:Name="root"
Width="500"
Height="400"
Background="{StaticResource ObjectEditBackgroundBrush}">
Background="{StaticResource ObjectEditBackgroundBrush}"
Focusable="True">
<UserControl.InputBindings>
<KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
</UserControl.InputBindings>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@@ -78,13 +82,13 @@
IsEnabled="False"
SelectedCompactEmployeeDC="{Binding PromptVM.Creator, ElementName=root}" />
<Label Grid.Row="4" Grid.Column="0">Öffentlich</Label>
<!--<Label Grid.Row="4" Grid.Column="0">Öffentlich</Label>
<dxe:CheckEdit
Grid.Row="4"
Grid.Column="2"
Margin="3"
IsChecked="{Binding PromptVM.IsPublic, ElementName=root}"
IsEnabled="{Binding PromptVM.CanShareEdit, UpdateSourceTrigger=PropertyChanged, ElementName=root}" />
IsEnabled="{Binding PromptVM.CanShareEdit, UpdateSourceTrigger=PropertyChanged, ElementName=root}" />-->
<Label Grid.Row="5" Grid.Column="0">Favorit</Label>
<dxe:CheckEdit

View File

@@ -12,7 +12,11 @@
d:DesignHeight="450"
d:DesignWidth="800"
Background="{StaticResource ObjectEditBackgroundBrush}"
Focusable="True"
mc:Ignorable="d">
<UserControl.InputBindings>
<KeyBinding Key="Esc" Command="{Binding CancelCommand}" />
</UserControl.InputBindings>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@@ -199,12 +203,11 @@
Margin="0,19,0,0"
HorizontalAlignment="Right"
Orientation="Horizontal">
<!--<Button
<Button
Width="100"
Command="{Binding CancelCommand}"
Visibility="Collapsed">
Command="{Binding CancelCommand}">
Abbrechen
</Button>-->
</Button>
<Button
Width="100"
Command="{Binding AcceptCommand}"

View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress>
</Use64BitIISExpress>
<IISExpressSSLPort />