Skip to content

Commit 4d72f1f

Browse files
committed
Update MessageBox.cs
1 parent 63acdfc commit 4d72f1f

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ public sealed class MessageBox : Window
5050

5151
private bool _showNo;
5252

53+
private IntPtr _lastActiveWindowIntPtr;
54+
5355
public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
5456
"Message", typeof(string), typeof(MessageBox), new PropertyMetadata(default(string)));
5557

@@ -127,6 +129,16 @@ protected override void OnSourceInitialized(EventArgs e)
127129
}
128130

129131
base.OnSourceInitialized(e);
132+
133+
_lastActiveWindowIntPtr = InteropMethods.GetForegroundWindow();
134+
Activate();
135+
}
136+
137+
protected override void OnClosed(EventArgs e)
138+
{
139+
InteropMethods.SetForegroundWindow(_lastActiveWindowIntPtr);
140+
141+
base.OnClosed(e);
130142
}
131143

132144
public override void OnApplyTemplate()

0 commit comments

Comments
 (0)