mirror of
https://github.com/greenshot/greenshot
synced 2025-08-20 05:23:24 -07:00
Merge remote-tracking branch 'remotes/origin/feature/BUG-1887_removed_grippers'
# Conflicts: # Greenshot/Drawing/DrawableContainer.cs # Greenshot/Drawing/SpeechbubbleContainer.cs
This commit is contained in:
commit
7872f2f7e4
30 changed files with 1016 additions and 419 deletions
|
@ -24,6 +24,7 @@ using Greenshot.Drawing.Fields;
|
|||
using Greenshot.Helpers;
|
||||
using Greenshot.Plugin.Drawing;
|
||||
using System.Drawing.Drawing2D;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace Greenshot.Drawing {
|
||||
/// <summary>
|
||||
|
@ -40,6 +41,18 @@ namespace Greenshot.Drawing {
|
|||
}
|
||||
|
||||
public FilterContainer(Surface parent) : base(parent) {
|
||||
Init();
|
||||
}
|
||||
|
||||
protected override void OnDeserialized(StreamingContext streamingContext)
|
||||
{
|
||||
base.OnDeserialized(streamingContext);
|
||||
Init();
|
||||
}
|
||||
|
||||
private void Init()
|
||||
{
|
||||
CreateDefaultAdorners();
|
||||
}
|
||||
|
||||
protected override void InitializeFields() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue