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 storing of the start value.

Browse source 
Updated SVG dependency, which fixes a few small issues with the Jira plug-in.
This commit is contained in:
Robin 2016-11-22 10:23:46 +01:00
parent dc29ef0a27
commit e654a60629
6 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Greenshot/Drawing/StepLabelContainer.cs
View file

@ -57,6 +57,8 @@ namespace Greenshot.Drawing {
#region Number serializing
// Used to store the number of this label, so when deserializing it can be placed back to the StepLabels list in the right location
private int _number;
// Used to store the counter start of the Surface, as the surface is NOT stored.
private int _counterStart = 1;
public int Number {
get {
return _number;
@ -74,6 +76,7 @@ namespace Greenshot.Drawing {
private void SetValuesOnSerializing(StreamingContext context) {
if (Parent != null) {
Number = ((Surface)Parent).CountStepLabels(this);
_counterStart = ((Surface) Parent).CounterStart;
}
}
#endregion
@ -90,6 +93,7 @@ namespace Greenshot.Drawing {
Alignment = StringAlignment.Center,
LineAlignment = StringAlignment.Center
};
}
/// <summary>
@ -103,10 +107,13 @@ namespace Greenshot.Drawing {
}
((Surface) Parent)?.RemoveStepLabel(this);
base.SwitchParent(newParent);
if (newParent != null) {
((Surface)Parent)?.AddStepLabel(this);
if (newParent == null)
{
return;
}
// Make sure the counter start is restored (this unfortunately happens multiple times... -> hack)
newParent.CounterStart = _counterStart;
newParent.AddStepLabel(this);
}
public override Size DefaultSize => new Size(30, 30);