diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml index 831dc4fb9be5878699e2b14aedc25c2c989a9fcb..7d7356c755f49e214c5af1317bb52e61d8af99ea 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml @@ -6,10 +6,9 @@ xmlns:local="clr-namespace:InnoLabProjektDektopApp" xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates" mc:Ignorable="d" - ContextMenuClosing="Page_ContextMenuClosing" Height="550" Width="900"> <Grid> - <!-- <header:HeaderTemplate VerticalAlignment="Center" Height="534" Loaded="HeaderTemplate_Loaded"/> --> + <!-- <header:HeaderTemplate VerticalAlignment="Center" Height="534"/> --> <Button Margin="0,100,150,10" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Background="Transparent" BorderBrush="Transparent" Click="discardSession_Click"> <Grid > <Line X1="5" Y1="5" X2="35" Y2="35" Stroke="Gray" StrokeThickness="5" /> diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs index 2b5bc38cf166e4ff2c6fb948dd316090d18052ac..0ac50052ebc7950bdd534505bc01c4e80c609ed9 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs @@ -29,7 +29,7 @@ namespace InnoLabProjektDektopApp private bool isBreakPeriod = false; // Speichert, ob wir in einer Pause sind - private Mascott mascott; + private static Mascott mascott; private Timer timer; @@ -281,11 +281,6 @@ namespace InnoLabProjektDektopApp reasonWindow.Show(); } - private void Page_ContextMenuClosing(object sender, ContextMenuEventArgs e) - { - mascott.Close(); - } - public DateTime timeLeft() { return DateTime.Now.AddSeconds(maxTime - seconds); diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Templates/HeaderTemplate.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Templates/HeaderTemplate.xaml.cs index eef54162fd07299544bf5b51322676ad9e4840a5..1ef7d93c26a2549cc38aedf11d3a1d3a6c99ebf6 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Templates/HeaderTemplate.xaml.cs +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Templates/HeaderTemplate.xaml.cs @@ -29,7 +29,7 @@ namespace InnoLabProjektDektopApp.Screens.Templates private void BurgerMenuButton_Click(object sender, RoutedEventArgs e) { // Toggle the visibility of the menu panel - //MenuPanel.Visibility = MenuPanel.Visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible; + MenuPanel.Visibility = MenuPanel.Visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible; } private void OverviewButton_Click(object sender, RoutedEventArgs e)