diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
index c8d92c6ffeff65b050366326cd9f5fee16505308..78a74b17dd7d6d277f23315a952c63f98e814f01 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
@@ -5,9 +5,10 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
- mc:Ignorable="d">
+ mc:Ignorable="d"
+ Background="{StaticResource BACKGROUND_PRIMARY_BRUSH}">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
- <Grid>
+ <Grid VerticalAlignment="Center">
<StackPanel Margin="20,20,20,20">
@@ -23,7 +24,6 @@
<TextBlock Text="ⓘ"
FontSize="14"
FontWeight="Bold"
- Foreground="Gray"
Margin="5,0,0,0"
VerticalAlignment="Center"
ToolTip="You can choose between 3 modes: In all modes, the mascot gives you visual feedback that you are currently distracting yourself. In full-blocking mode, the distracting item you try to reach is instantly automatically closed. In the warning mode, you receive a warning for X seconds during which you can re-decide if you want to enter the distracting item or not." />
@@ -35,17 +35,26 @@
<RadioButton Content=""
GroupName="Modes"
VerticalAlignment="Center" />
-
- <ComboBox x:Name="SecondsComboBox"
- Width="50"
- Margin="0,0,5,0"
- SelectedIndex="2">
- <ComboBoxItem Content="3" />
- <ComboBoxItem Content="5" />
- <ComboBoxItem Content="10" />
- <ComboBoxItem Content="15" />
- <ComboBoxItem Content="30" />
- </ComboBox>
+ <Border Name="DropdownBorder" Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Margin="0,0,5,0"
+Width="70" MouseDown="TogglePopup">
+ <Grid>
+ <TextBlock x:Name="SelectedText" Text="10" Foreground="{StaticResource BACKGROUND_PRIMARY_BRUSH}" FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,30,0"/>
+ <Path Fill="{StaticResource BACKGROUND_PRIMARY_BRUSH}" Data="M 0 0 L 8 8 L 16 0 Z" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10"/>
+ </Grid>
+ </Border>
+
+ <!-- Popup für die Dropdown-Liste -->
+ <Popup Name="PopupMenu" Placement="Bottom" PlacementTarget="{Binding ElementName=DropdownBorder}" StaysOpen="True" Width="70">
+ <Border Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Width="70">
+ <ListBox x:Name="CategoryList" SelectionChanged="CategoryList_SelectionChanged" Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}">
+ <ListBoxItem Content="3"/>
+ <ListBoxItem Content="5"/>
+ <ListBoxItem Content="10"/>
+ <ListBoxItem Content="15"/>
+ <ListBoxItem Content="30" />
+ </ListBox>
+ </Border>
+ </Popup>
<TextBlock Text="seconds warning mode"
VerticalAlignment="Center" />
</StackPanel>
@@ -58,7 +67,6 @@
<TextBlock Text="ⓘ"
FontSize="14"
FontWeight="Bold"
-Foreground="Gray"
Margin="5,0,0,0"
VerticalAlignment="Center"
ToolTip="If the mascot is visible while you work, its emotions reflect how focused you are which can be motivating. Deselect the mascot if you find it annoying." />
@@ -75,7 +83,6 @@ ToolTip="If the mascot is visible while you work, its emotions reflect how focus
<TextBlock Text="ⓘ"
FontSize="14"
FontWeight="Bold"
-Foreground="Gray"
Margin="5,0,0,0"
VerticalAlignment="Center"
ToolTip="If words of affirmation are selected and you work focusedly, the mascot is going to tell you stuff like 'You have not distracted yourself for 30 minutes! I am proud of you!' If insulting words are selected and you distract yourself during the focus mode, the mascot is going to tell you stuff like 'I have already finished 10 exercises - why are you not working focused like me?" />
@@ -83,13 +90,11 @@ ToolTip="If words of affirmation are selected and you work focusedly, the mascot
<StackPanel Orientation="Horizontal" >
<CheckBox x:Name="WordsOfAffirmationCheckBox" IsChecked="True" VerticalAlignment="Center"/>
<TextBlock
-Style="{StaticResource StandardText}"
Text="by words of affirmation" Margin="10,0,0,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<CheckBox x:Name="InsultingWordsCheckBox" IsChecked="True" VerticalAlignment="Center"/>
<TextBlock
-Style="{StaticResource StandardText}"
Text="by insulting words" Margin="10,0,0,0"/>
</StackPanel>
</StackPanel>
@@ -103,14 +108,13 @@ Text="by insulting words" Margin="10,0,0,0"/>
<TextBlock Text="ⓘ"
FontSize="14"
FontWeight="Bold"
-Foreground="Gray"
Margin="5,0,0,0"
VerticalAlignment="Center"
ToolTip="You can decide how long the focus and break period should be. The focus period is the period in which you want to work focused without taking a break. The break period determines how long the break after each focus period should be. With cycles you can decide how often you want to cycle through focus and break periods. For example, a cylcle of 2, a focus period of 50 and a break period of 10 means that your total focus session looks like this: 50 minutes focused work, 10 minutes break, 50 minutes focused work and 10 minutes break." />
</StackPanel>
<!-- Graue Box -->
- <Border Background="LightGray" CornerRadius="10" Padding="3" Margin="5" BorderBrush="#D3D3D3" BorderThickness="1">
+ <Border Background="{StaticResource BACKGROUND_SECONDARY_BRUSH}" CornerRadius="10" Padding="3" Margin="5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
@@ -120,77 +124,114 @@ ToolTip="You can decide how long the focus and break period should be. The focus
<!-- Focus Period -->
<StackPanel Grid.Column="0" Margin="10">
- <TextBlock Text="Focus period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" />
+ <TextBlock Text="Focus period" FontSize="14" FontWeight="SemiBold" />
<StackPanel Orientation="Horizontal">
- <ComboBox x:Name="FocusPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="100" FontSize="14" Padding="5" SelectionChanged="ComboBox_SelectionChanged" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
- <ComboBoxItem Content="1" />
- <ComboBoxItem Content="20" />
- <ComboBoxItem Content="30" />
- <ComboBoxItem Content="40" />
- <ComboBoxItem Content="50" IsSelected="True" />
- <ComboBoxItem Content="60" />
- <ComboBoxItem Content="90" />
- <ComboBoxItem Content="120" />
- <ComboBoxItem Content="150" />
- <ComboBoxItem Content="180" />
- </ComboBox>
- <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" />
+
+ <Border Name="DropdownBorder2" Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}" CornerRadius="5" Margin="0,5,0,0"
+Width="70" MouseDown="TogglePopup2">
+ <Grid>
+ <TextBox x:Name="SelectedText2" Text="45" Foreground="{StaticResource BACKGROUND_PRIMARY_BRUSH}"
+ FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,30,0"
+ Background="Transparent" BorderThickness="0" TextChanged="SelectedTextBox2_TextChanged"/>
+ <Path Fill="{StaticResource BACKGROUND_PRIMARY_BRUSH}" Data="M 0 0 L 8 8 L 16 0 Z" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10"/>
+ </Grid>
+ </Border>
+
+ <!-- Popup für die Dropdown-Liste -->
+ <Popup Name="PopupMenu2" Placement="Bottom" PlacementTarget="{Binding ElementName=DropdownBorder2}" StaysOpen="True" Width="70">
+ <Border Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Width="70">
+ <ListBox x:Name="CategoryList2" SelectionChanged="CategoryList_SelectionChanged2" Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}">
+ <ListBoxItem Content="20"/>
+ <ListBoxItem Content="30"/>
+ <ListBoxItem Content="45"/>
+ <ListBoxItem Content="60"/>
+ <ListBoxItem Content="90"/>
+ <ListBoxItem Content="120"/>
+ <ListBoxItem Content="180"/>
+ </ListBox>
+ </Border>
+ </Popup>
+ <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" />
</StackPanel>
</StackPanel>
<!-- Break Period -->
<StackPanel Grid.Column="1" Margin="10">
- <TextBlock Text="Break period" FontSize="14" FontWeight="SemiBold" Foreground="Gray" />
+ <TextBlock Text="Break period" FontSize="14" FontWeight="SemiBold" />
<StackPanel Orientation="Horizontal">
- <ComboBox x:Name="BreakPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="100" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
- <ComboBoxItem Content="0" />
- <ComboBoxItem Content="1" />
- <ComboBoxItem Content="3" />
- <ComboBoxItem Content="5" />
- <ComboBoxItem Content="10" IsSelected="True" />
- <ComboBoxItem Content="15" />
- <ComboBoxItem Content="20" />
- <ComboBoxItem Content="25" />
- <ComboBoxItem Content="30" />
- </ComboBox>
- <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" />
+ <Border Name="DropdownBorder3" Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}" CornerRadius="5" Margin="0,5,0,0"
+Width="70" MouseDown="TogglePopup3">
+ <Grid>
+ <TextBox x:Name="SelectedText3" Text="10" Foreground="{StaticResource BACKGROUND_PRIMARY_BRUSH}"
+ FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,30,0"
+ Background="Transparent" BorderThickness="0" TextChanged="SelectedTextBox2_TextChanged"/>
+ <Path Fill="{StaticResource BACKGROUND_PRIMARY_BRUSH}" Data="M 0 0 L 8 8 L 16 0 Z" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10"/>
+ </Grid>
+ </Border>
+
+ <!-- Popup für die Dropdown-Liste -->
+ <Popup Name="PopupMenu3" Placement="Bottom" PlacementTarget="{Binding ElementName=DropdownBorder3}" StaysOpen="True" Width="70">
+ <Border Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Width="70">
+ <ListBox x:Name="CategoryList3" SelectionChanged="CategoryList_SelectionChanged3" Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}">
+ <ListBoxItem Content="0"/>
+ <ListBoxItem Content="1"/>
+ <ListBoxItem Content="3"/>
+ <ListBoxItem Content="5"/>
+ <ListBoxItem Content="10"/>
+ <ListBoxItem Content="20"/>
+ <ListBoxItem Content="30"/>
+ </ListBox>
+ </Border>
+ </Popup>
+ <TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" />
</StackPanel>
</StackPanel>
<!-- Cycles -->
<StackPanel Grid.Column="2" Margin="10">
- <TextBlock Text="Cycles" FontSize="14" FontWeight="SemiBold" Foreground="Gray" />
- <ComboBox x:Name="CyclesComboBox" HorizontalAlignment="Left" Height="30" Width="150" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">>
- <ComboBoxItem Content="1" />
- <ComboBoxItem Content="2" />
- <ComboBoxItem Content="3" />
- <ComboBoxItem Content="4" IsSelected="True" />
- <ComboBoxItem Content="5" />
- <ComboBoxItem Content="6" />
- </ComboBox>
+ <TextBlock Text="Cycles" FontSize="14" FontWeight="SemiBold" />
+ <StackPanel Orientation="Horizontal">
+ <Border Name="DropdownBorder4" Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}" CornerRadius="5" Margin="0,5,0,0"
+Width="70" MouseDown="TogglePopup4">
+ <Grid>
+ <TextBox x:Name="SelectedText4" Text="4" Foreground="{StaticResource BACKGROUND_PRIMARY_BRUSH}"
+ FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,30,0"
+ Background="Transparent" BorderThickness="0" TextChanged="SelectedTextBox2_TextChanged"/>
+ <Path Fill="{StaticResource BACKGROUND_PRIMARY_BRUSH}" Data="M 0 0 L 8 8 L 16 0 Z" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10"/>
+ </Grid>
+ </Border>
+
+ <!-- Popup für die Dropdown-Liste -->
+ <Popup Name="PopupMenu4" Placement="Bottom" PlacementTarget="{Binding ElementName=DropdownBorder4}" StaysOpen="True" Width="70">
+ <Border Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Width="70">
+ <ListBox x:Name="CategoryList4" SelectionChanged="CategoryList_SelectionChanged4" Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}">
+ <ListBoxItem Content="1"/>
+ <ListBoxItem Content="2"/>
+ <ListBoxItem Content="3"/>
+ <ListBoxItem Content="4"/>
+ <ListBoxItem Content="5"/>
+ <ListBoxItem Content="6"/>
+ </ListBox>
+ </Border>
+ </Popup>
+ </StackPanel>
</StackPanel>
</Grid>
</Border>
- <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,20,0,0">
- <!-- Save Button -->
- <Button Content="Save" Width="100" Height="30" Margin="0,0,10,0" Click="SaveSettingsButton_Click"/>
-
- <!-- Navigate to Overview Button -->
- <Button Content="Back to Overview" Width="150" Height="30" Click="NavigateToOverviewButton_Click"/>
- </StackPanel>
-
</StackPanel>
<!-- Pagination -->
- <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,478,0,0" Width="265" VerticalAlignment="Top">
- <Button Content="Previous" Width="70" Margin="5" Click="PreviousPage_Click" />
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,478,0,0" VerticalAlignment="Top">
+ <Border Style="{StaticResource RoundedButtonBorder}" MouseDown="PreviousPage_Click" Width="100" Margin="10">
+ <TextBlock Text="Previous" Style="{StaticResource ButtonTextStyle}" />
+ </Border>
<StackPanel Orientation="Horizontal">
- <Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
+ <Ellipse Width="15" Height="15" Fill="{StaticResource TEXT_PRIMARY_BRUSH}" Margin="5"/>
<!-- Aktive Seite -->
- <Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
+ <Ellipse Width="15" Height="15" Fill="{StaticResource TEXT_PRIMARY_BRUSH}" Margin="5"/>
<!-- Inaktive Seite -->
- <Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
+ <Ellipse Width="15" Height="15" Fill="{StaticResource TEXT_PRIMARY_BRUSH}" Margin="5"/>
<Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
</StackPanel>
@@ -202,7 +243,9 @@ ToolTip="You can decide how long the focus and break period should be. The focus
<Button Content="5" Width="20" Margin="5" Click="fifth_Page" />
-->
- <Button Content="Next" Width="70" Margin="5" Click="NextPage_Click" />
+ <Border Style="{StaticResource RoundedButtonBorder}" MouseDown="NextPage_Click" Width="100" Margin="10">
+ <TextBlock Text="Next" Style="{StaticResource ButtonTextStyle}" />
+ </Border>
</StackPanel>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
index 1e77ece1f8dada3cb8473913d18884d881f30aa2..db7bb5b05bc011efaa6f0b2e684a6592533de84b 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
@@ -10,6 +10,7 @@ using System.Windows.Navigation;
using System.Windows.Shapes;
using System.IO;
using System.Text.Json;
+using System.Text.RegularExpressions;
namespace InnoLabProjektDektopApp
@@ -55,19 +56,14 @@ namespace InnoLabProjektDektopApp
}
- private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
- {
-
- }
-
- private void SaveSettingsButton_Click(object sender, RoutedEventArgs e)
+ private void SaveSettings()
{
// Sammle die Werte aus den ComboBoxen oder verwende Standardwerte
- string focusPeriod = string.IsNullOrWhiteSpace(FocusPeriodComboBox.Text) ? "50" : FocusPeriodComboBox.Text;
- string breakPeriod = string.IsNullOrWhiteSpace(BreakPeriodComboBox.Text) ? "10" : BreakPeriodComboBox.Text;
- string cycles = string.IsNullOrWhiteSpace(CyclesComboBox.Text) ? "4" : CyclesComboBox.Text;
+ string focusPeriod = string.IsNullOrWhiteSpace(SelectedText2.Text) ? "45" : SelectedText2.Text;
+ string breakPeriod = string.IsNullOrWhiteSpace(SelectedText3.Text) ? "45" : SelectedText3.Text;
+ string cycles = string.IsNullOrWhiteSpace(SelectedText4.Text) ? "4" : SelectedText4.Text;
string distractionMode = DistractionModeFullBlocking.IsChecked == true
? "Full-blocking mode"
@@ -75,9 +71,9 @@ namespace InnoLabProjektDektopApp
? "Mascot feedback only"
: "seconds warning mode";
- string warningSeconds = !string.IsNullOrWhiteSpace(SecondsComboBox.Text)
- ? SecondsComboBox.Text
- : "10";
+ string warningSeconds = !string.IsNullOrWhiteSpace(SelectedText.Text)
+ ? SelectedText.Text
+ : "10";
string mascotVisible = MascotVisibleYes.IsChecked == true ? "Yes" : "No";
@@ -129,28 +125,169 @@ namespace InnoLabProjektDektopApp
}
}
- private void NavigateToOverviewButton_Click(object sender, RoutedEventArgs e)
+ private void PreviousPage_Click(object sender, RoutedEventArgs e)
{
+ this.NavigationService.Navigate(new Distractions());
+ }
+ private void NextPage_Click(object sender, RoutedEventArgs e)
+ {
+ SaveSettings();
this.NavigationService.Navigate(new Overview());
+ }
+ private void TogglePopup(object sender, MouseButtonEventArgs e)
+ {
+ // Popup umschalten
+ PopupMenu.IsOpen = !PopupMenu.IsOpen;
+
+ // Wenn das Popup geöffnet wird, registriere das globale Klick-Event
+ if (PopupMenu.IsOpen)
+ {
+ this.PreviewMouseDown += ClosePopupOnClickOutside;
+ }
}
- private void ComboBox_PreviewTextInput(object sender, TextCompositionEventArgs e)
+ private void CategoryList_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
- e.Handled = !int.TryParse(e.Text, out _);
+ if (CategoryList.SelectedItem is ListBoxItem selectedItem)
+ {
+ SelectedText.Text = selectedItem.Content.ToString();
+ PopupMenu.IsOpen = false; // Popup schließen nach Auswahl
+ this.PreviewMouseDown -= ClosePopupOnClickOutside; // Event entfernen
+ }
}
+ private void ClosePopupOnClickOutside(object sender, MouseButtonEventArgs e)
+ {
+ if (!PopupMenu.IsMouseOver && !DropdownBorder.IsMouseOver)
+ {
+ PopupMenu.IsOpen = false;
+ this.PreviewMouseDown -= ClosePopupOnClickOutside; // Event entfernen
+ }
+ }
+ private void TogglePopup2(object sender, MouseButtonEventArgs e)
+ {
+ // Popup umschalten
+ PopupMenu2.IsOpen = !PopupMenu2.IsOpen;
- private void PreviousPage_Click(object sender, RoutedEventArgs e)
+ // Wenn das Popup geöffnet wird, registriere das globale Klick-Event
+ if (PopupMenu2.IsOpen)
+ {
+ this.PreviewMouseDown += ClosePopupOnClickOutside2;
+ }
+ }
+
+ private void CategoryList_SelectionChanged2(object sender, SelectionChangedEventArgs e)
{
- this.NavigationService.Navigate(new Distractions());
+ if (CategoryList2.SelectedItem is ListBoxItem selectedItem)
+ {
+ SelectedText2.Text = selectedItem.Content.ToString();
+ PopupMenu2.IsOpen = false; // Popup schließen nach Auswahl
+ this.PreviewMouseDown -= ClosePopupOnClickOutside2; // Event entfernen
+ }
}
- private void NextPage_Click(object sender, RoutedEventArgs e)
+ private void SelectedTextBox2_TextChanged(object sender, TextChangedEventArgs e)
{
- this.NavigationService.Navigate(new Overview());
+ TextBox textBox = sender as TextBox;
+ if (textBox == null) return;
+
+ string input = textBox.Text;
+
+ // Erlaubt nur numerische Eingaben (positive Ganzzahlen) und begrenzt die Länge auf 3 Zeichen
+ if (!Regex.IsMatch(input, @"^\d*$"))
+ {
+ int cursorPos = textBox.SelectionStart - 1; // Cursor-Position speichern
+ textBox.Text = Regex.Replace(input, @"\D", ""); // Alle nicht-numerischen Zeichen entfernen
+ textBox.SelectionStart = Math.Max(cursorPos, 0); // Cursor wieder an die ursprüngliche Stelle setzen
+ }
+
+ // Maximal 3 Zeichen erlauben
+ if (textBox.Text.Length > 3)
+ {
+ int cursorPos = textBox.SelectionStart - 1; // Cursor-Position speichern
+ textBox.Text = textBox.Text.Substring(0, 3); // Kürzt den Text auf 3 Zeichen
+ textBox.SelectionStart = Math.Max(cursorPos, 0); // Cursor-Position wieder setzen
+ }
+ }
+
+
+
+ private void ClosePopupOnClickOutside2(object sender, MouseButtonEventArgs e)
+ {
+ if (!PopupMenu2.IsMouseOver && !DropdownBorder2.IsMouseOver)
+ {
+ PopupMenu2.IsOpen = false;
+ this.PreviewMouseDown -= ClosePopupOnClickOutside; // Event entfernen
+ }
+ }
+
+ private void TogglePopup3(object sender, MouseButtonEventArgs e)
+ {
+ // Popup umschalten
+ PopupMenu3.IsOpen = !PopupMenu2.IsOpen;
+
+ // Wenn das Popup geöffnet wird, registriere das globale Klick-Event
+ if (PopupMenu3.IsOpen)
+ {
+ this.PreviewMouseDown += ClosePopupOnClickOutside3;
+ }
+ }
+
+ private void CategoryList_SelectionChanged3(object sender, SelectionChangedEventArgs e)
+ {
+ if (CategoryList3.SelectedItem is ListBoxItem selectedItem)
+ {
+ SelectedText3.Text = selectedItem.Content.ToString();
+ PopupMenu3.IsOpen = false; // Popup schließen nach Auswahl
+ this.PreviewMouseDown -= ClosePopupOnClickOutside3; // Event entfernen
+ }
+ }
+
+
+
+ private void ClosePopupOnClickOutside3(object sender, MouseButtonEventArgs e)
+ {
+ if (!PopupMenu3.IsMouseOver && !DropdownBorder2.IsMouseOver)
+ {
+ PopupMenu3.IsOpen = false;
+ this.PreviewMouseDown -= ClosePopupOnClickOutside; // Event entfernen
+ }
+ }
+
+ private void TogglePopup4(object sender, MouseButtonEventArgs e)
+ {
+ // Popup umschalten
+ PopupMenu4.IsOpen = !PopupMenu2.IsOpen;
+
+ // Wenn das Popup geöffnet wird, registriere das globale Klick-Event
+ if (PopupMenu4.IsOpen)
+ {
+ this.PreviewMouseDown += ClosePopupOnClickOutside4;
+ }
+ }
+
+ private void CategoryList_SelectionChanged4(object sender, SelectionChangedEventArgs e)
+ {
+ if (CategoryList4.SelectedItem is ListBoxItem selectedItem)
+ {
+ SelectedText4.Text = selectedItem.Content.ToString();
+ PopupMenu4.IsOpen = false; // Popup schließen nach Auswahl
+ this.PreviewMouseDown -= ClosePopupOnClickOutside4; // Event entfernen
+ }
+ }
+
+
+
+ private void ClosePopupOnClickOutside4(object sender, MouseButtonEventArgs e)
+ {
+ if (!PopupMenu4.IsMouseOver && !DropdownBorder2.IsMouseOver)
+ {
+ PopupMenu4.IsOpen = false;
+ this.PreviewMouseDown -= ClosePopupOnClickOutside; // Event entfernen
+ }
}
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Styles/Styles.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Styles/Styles.xaml
index be44095e0e039b106c8d3957d1b805fbe9f500bb..14c2e657856d11bf63e9545b17280f5d49644c3e 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Styles/Styles.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Styles/Styles.xaml
@@ -28,8 +28,7 @@
<Style TargetType="ToolTip">
- <Setter Property="Background" Value="LightYellow" />
- <Setter Property="Foreground" Value="Black" />
+ <Setter Property="Background" Value="Black" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ToolTip">