diff --git a/Text-Grab/Controls/PreviousGrabWindow.xaml b/Text-Grab/Controls/PreviousGrabWindow.xaml index 743203c9..72e7938c 100644 --- a/Text-Grab/Controls/PreviousGrabWindow.xaml +++ b/Text-Grab/Controls/PreviousGrabWindow.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Text_Grab.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:wpfui="http://schemas.lepo.co/wpfui/2022/xaml" Title="PreviousGrabWindow" Width="800" Height="450" @@ -12,8 +13,22 @@ Background="Transparent" BorderBrush="{StaticResource Teal}" BorderThickness="3" + IsHitTestVisible="False" Topmost="True" WindowStyle="None" mc:Ignorable="d"> - + + + + + diff --git a/Text-Grab/Controls/PreviousGrabWindow.xaml.cs b/Text-Grab/Controls/PreviousGrabWindow.xaml.cs index 33550ef9..f8e6f448 100644 --- a/Text-Grab/Controls/PreviousGrabWindow.xaml.cs +++ b/Text-Grab/Controls/PreviousGrabWindow.xaml.cs @@ -1,5 +1,6 @@ using System; using System.Windows; +using System.Windows.Media; using System.Windows.Threading; namespace Text_Grab.Controls; @@ -9,7 +10,7 @@ namespace Text_Grab.Controls; /// public partial class PreviousGrabWindow : Window { - public PreviousGrabWindow(Rect rect) + public PreviousGrabWindow(Rect rect, bool showSuccess = false) { InitializeComponent(); @@ -20,6 +21,13 @@ public PreviousGrabWindow(Rect rect) Left = rect.Left - borderThickness; Top = rect.Top - borderThickness; + if (showSuccess) + { + SuccessViewbox.Visibility = Visibility.Visible; + } + + + DispatcherTimer timer = new DispatcherTimer(); timer.Interval = TimeSpan.FromMilliseconds(500); timer.Tick += (s, e) => { timer.Stop(); Close(); }; diff --git a/Text-Grab/Views/FullscreenGrab.xaml.cs b/Text-Grab/Views/FullscreenGrab.xaml.cs index ed497268..5a2626dd 100644 --- a/Text-Grab/Views/FullscreenGrab.xaml.cs +++ b/Text-Grab/Views/FullscreenGrab.xaml.cs @@ -7,6 +7,7 @@ using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Media; +using Text_Grab.Controls; using Text_Grab.Interfaces; using Text_Grab.Models; using Text_Grab.Properties; @@ -614,6 +615,13 @@ private async void RegionClickCanvas_MouseUp(object sender, MouseButtonEventArgs EditTextWindow etw = WindowUtilities.OpenOrActivateWindow(); destinationTextBox = etw.PassedTextControl; } + Rect selectBorderRect = new( + Canvas.GetLeft(selectBorder), + Canvas.GetTop(selectBorder), + selectBorder.Width, + selectBorder.Height); + PreviousGrabWindow previousGrab = new(selectBorderRect, true); + previousGrab.Show(); OutputUtilities.HandleTextFromOcr( grabbedText,