diff --git a/VPet-Simulator.Core/Display/MessageBar.xaml b/VPet-Simulator.Core/Display/MessageBar.xaml index 38e80e1..80d76d3 100644 --- a/VPet-Simulator.Core/Display/MessageBar.xaml +++ b/VPet-Simulator.Core/Display/MessageBar.xaml @@ -3,23 +3,30 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:pu="https://opensource.panuon.com/wpf-ui" xmlns:local="clr-namespace:VPet_Simulator.Core" mc:Ignorable="d" Height="500" Width="500" + xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" MouseDoubleClick="UserControl_MouseDoubleClick"> - + - + + + + + + + diff --git a/VPet-Simulator.Core/Display/MessageBar.xaml.cs b/VPet-Simulator.Core/Display/MessageBar.xaml.cs index 7cdc8a4..63dc1fb 100644 --- a/VPet-Simulator.Core/Display/MessageBar.xaml.cs +++ b/VPet-Simulator.Core/Display/MessageBar.xaml.cs @@ -91,6 +91,7 @@ namespace VPet_Simulator.Core public Action EndAction; private void EndTimer_Elapsed(object sender, ElapsedEventArgs e) { + if (--timeleft <= 0) { EndTimer.Stop(); @@ -169,5 +170,19 @@ namespace VPet_Simulator.Core BorderMain.VerticalAlignment = VerticalAlignment.Top; Margin = new Thickness(0, 500, 0, 0); } + + private void MenuItemCopy_Click(object sender, RoutedEventArgs e) + { + Clipboard.SetText(TText.Text); + } + + private void MenuItemClose_Click(object sender, RoutedEventArgs e) + { + ForceClose(); + } + + private void ContextMenu_Opened(object sender, RoutedEventArgs e) => Border_MouseEnter(null, null); + + private void ContextMenu_Closed(object sender, RoutedEventArgs e) => Border_MouseLeave(null, null); } }