github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FEATURE-863: Fixed counter to work with a flag, still the starting value is not serialized / deserialized?

Browse source
This commit is contained in:
Robin 2016-11-22 07:31:11 +01:00
parent f2f37700b3
commit dc29ef0a27
6 changed files with 30 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Greenshot/Drawing/StepLabelContainer.cs
View file

@ -49,19 +49,9 @@ namespace Greenshot.Drawing {
Init();
}
private void UpdateCounterOnFieldChanged(object sender, FieldChangedEventArgs fieldChangedEventArgs)
{
if (Equals(fieldChangedEventArgs.Field.FieldType, FieldType.COUNTER_START))
{
Parent.CounterStart = (int)fieldChangedEventArgs.Field.Value;
}
}
private void Init()
{
CreateDefaultAdorners();
FieldChanged -= UpdateCounterOnFieldChanged;
FieldChanged += UpdateCounterOnFieldChanged;
}
#region Number serializing
@ -113,10 +103,6 @@ namespace Greenshot.Drawing {
}
((Surface) Parent)?.RemoveStepLabel(this);
base.SwitchParent(newParent);
if (Parent != null)
{
Parent.CounterStart = GetFieldValueAsInt(FieldType.COUNTER_START);
}
if (newParent != null) {
((Surface)Parent)?.AddStepLabel(this);
}
@ -150,7 +136,7 @@ namespace Greenshot.Drawing {
protected override void InitializeFields() {
AddField(GetType(), FieldType.FILL_COLOR, Color.DarkRed);
AddField(GetType(), FieldType.LINE_COLOR, Color.White);
AddField(GetType(), FieldType.COUNTER_START, 1);
AddField(GetType(), FieldType.FLAGS, FieldFlag.COUNTER);
}
/// <summary>