github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 21:43:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed an issue which was described in #217, also did some hardening that it doesn't happen on other locations in the TextContainer.

Browse source
This commit is contained in:
Robin Krom 2020-08-06 17:02:26 +02:00
commit ca0095491b
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Greenshot/Drawing/TextContainer.cs
View file

@ -158,9 +158,15 @@ namespace Greenshot.Drawing
protected override void SwitchParent(Surface newParent) protected override void SwitchParent(Surface newParent)
{ {
_parent.SizeChanged -= Parent_SizeChanged; if (_parent != null)
{
_parent.SizeChanged -= Parent_SizeChanged;
}
base.SwitchParent(newParent); base.SwitchParent(newParent);
_parent.SizeChanged += Parent_SizeChanged; if (_parent != null)
{
_parent.SizeChanged += Parent_SizeChanged;
}
} }
private void Parent_SizeChanged(object sender, EventArgs e) private void Parent_SizeChanged(object sender, EventArgs e)
@ -320,8 +326,12 @@ namespace Greenshot.Drawing
private void HideTextBox() private void HideTextBox()
{ {
_parent.Focus(); _parent?.Focus();
_textBox?.Hide(); _textBox?.Hide();
if (_parent == null)
{
return;
}
_parent.KeysLocked = false; _parent.KeysLocked = false;
_parent.Controls.Remove(_textBox); _parent.Controls.Remove(_textBox);
} }