mirror of
https://github.com/greenshot/greenshot
synced 2025-07-16 10:03:44 -07:00
FEATURE-863: Fixed storing of the start value.
Updated SVG dependency, which fixes a few small issues with the Jira plug-in.
This commit is contained in:
parent
dc29ef0a27
commit
e654a60629
6 changed files with 24 additions and 10 deletions
|
@ -57,6 +57,8 @@ namespace Greenshot.Drawing {
|
||||||
#region Number serializing
|
#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
|
// 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;
|
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 {
|
public int Number {
|
||||||
get {
|
get {
|
||||||
return _number;
|
return _number;
|
||||||
|
@ -74,6 +76,7 @@ namespace Greenshot.Drawing {
|
||||||
private void SetValuesOnSerializing(StreamingContext context) {
|
private void SetValuesOnSerializing(StreamingContext context) {
|
||||||
if (Parent != null) {
|
if (Parent != null) {
|
||||||
Number = ((Surface)Parent).CountStepLabels(this);
|
Number = ((Surface)Parent).CountStepLabels(this);
|
||||||
|
_counterStart = ((Surface) Parent).CounterStart;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
@ -90,6 +93,7 @@ namespace Greenshot.Drawing {
|
||||||
Alignment = StringAlignment.Center,
|
Alignment = StringAlignment.Center,
|
||||||
LineAlignment = StringAlignment.Center
|
LineAlignment = StringAlignment.Center
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -103,10 +107,13 @@ namespace Greenshot.Drawing {
|
||||||
}
|
}
|
||||||
((Surface) Parent)?.RemoveStepLabel(this);
|
((Surface) Parent)?.RemoveStepLabel(this);
|
||||||
base.SwitchParent(newParent);
|
base.SwitchParent(newParent);
|
||||||
if (newParent != null) {
|
if (newParent == null)
|
||||||
((Surface)Parent)?.AddStepLabel(this);
|
{
|
||||||
|
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);
|
public override Size DefaultSize => new Size(30, 30);
|
||||||
|
|
|
@ -269,12 +269,14 @@ namespace Greenshot.Drawing
|
||||||
get { return _counterStart; }
|
get { return _counterStart; }
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (_propertyChanged != null && _counterStart != value)
|
if (_counterStart == value)
|
||||||
{
|
{
|
||||||
_counterStart = value;
|
return;
|
||||||
_propertyChanged(this, new PropertyChangedEventArgs("CounterStart"));
|
|
||||||
Invalidate();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_counterStart = value;
|
||||||
|
Invalidate();
|
||||||
|
_propertyChanged?.Invoke(this, new PropertyChangedEventArgs("CounterStart"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -207,6 +207,8 @@ namespace Greenshot {
|
||||||
// Workaround: for the MouseWheel event which doesn't get to the panel
|
// Workaround: for the MouseWheel event which doesn't get to the panel
|
||||||
MouseWheel += PanelMouseWheel;
|
MouseWheel += PanelMouseWheel;
|
||||||
|
|
||||||
|
// Make sure the value is set correctly when starting
|
||||||
|
counterUpDown.Value = Surface.CounterStart;
|
||||||
ApplyLanguage();
|
ApplyLanguage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,8 +49,8 @@
|
||||||
<Reference Include="log4net">
|
<Reference Include="log4net">
|
||||||
<HintPath>..\Greenshot\Lib\log4net.dll</HintPath>
|
<HintPath>..\Greenshot\Lib\log4net.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Svg, Version=2.2.1.1459, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
|
<Reference Include="Svg, Version=2.2.1.38382, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Svg.2.2.1\lib\net35\Svg.dll</HintPath>
|
<HintPath>..\packages\Svg.2.2.2\lib\net35\Svg.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
|
|
|
@ -4,5 +4,5 @@
|
||||||
<package id="Dapplo.Jira" version="0.1.65" targetFramework="net45" />
|
<package id="Dapplo.Jira" version="0.1.65" targetFramework="net45" />
|
||||||
<package id="Dapplo.Log.Facade" version="0.5.4" targetFramework="net45" />
|
<package id="Dapplo.Log.Facade" version="0.5.4" targetFramework="net45" />
|
||||||
<package id="LibZ.Tool" version="1.2.0.0" targetFramework="net45" />
|
<package id="LibZ.Tool" version="1.2.0.0" targetFramework="net45" />
|
||||||
<package id="Svg" version="2.2.1" targetFramework="net45" />
|
<package id="Svg" version="2.2.2" targetFramework="net45" />
|
||||||
</packages>
|
</packages>
|
|
@ -111,6 +111,9 @@ namespace Greenshot.Plugin
|
||||||
event SurfaceDrawingModeEventHandler DrawingModeChanged;
|
event SurfaceDrawingModeEventHandler DrawingModeChanged;
|
||||||
event SurfaceElementEventHandler MovingElementChanged;
|
event SurfaceElementEventHandler MovingElementChanged;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Start valueof the step-labels (counts)
|
||||||
|
/// </summary>
|
||||||
int CounterStart { get; set; }
|
int CounterStart { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue