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

BUG-2021 & BUG-2022: Fixes for exceptions.

Browse source
This commit is contained in:
Robin 2016-09-14 10:50:40 +02:00
commit 35ed3b8d60
6 changed files with 51 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Greenshot/Drawing/Fields/FieldAggregator.cs
View file

@ -153,7 +153,7 @@ namespace Greenshot.Drawing.Fields
{
ClearFields();
internalUpdateRunning = true;
foreach (Field field in FindCommonFields())
foreach (var field in FindCommonFields())
{
SetFieldValue(field.FieldType, field.Value);
}

2
Greenshot/Drawing/Surface.cs
View file

@ -1910,7 +1910,7 @@ namespace Greenshot.Drawing
FieldAggregator.UnbindElement(container);
if (generateEvents && _movingElementChanged != null)
{
SurfaceElementEventArgs eventArgs = new SurfaceElementEventArgs {Elements = selectedElements};
var eventArgs = new SurfaceElementEventArgs {Elements = selectedElements};
_movingElementChanged(this, eventArgs);
}
}

16
Greenshot/Drawing/TextContainer.cs
View file

@ -56,7 +56,8 @@ namespace Greenshot.Drawing
/// The StringFormat object is not serializable!!
/// </summary>
[NonSerialized]
StringFormat _stringFormat = new StringFormat();
private StringFormat _stringFormat = new StringFormat();
public StringFormat StringFormat => _stringFormat;
// Although the name is wrong, we can't change it due to file serialization
@ -172,8 +173,13 @@ namespace Greenshot.Drawing
Height = textSize.Height + lineThickness;
}
void TextContainer_PropertyChanged(object sender, PropertyChangedEventArgs e)
private void TextContainer_PropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (_textBox == null)
{
return;
}
if (_textBox.Visible)
{
_textBox.Invalidate();
@ -203,7 +209,7 @@ namespace Greenshot.Drawing
}
}
void TextContainer_FieldChanged(object sender, FieldChangedEventArgs e)
private void TextContainer_FieldChanged(object sender, FieldChangedEventArgs e)
{
if (_textBox == null)
{
@ -467,7 +473,7 @@ namespace Greenshot.Drawing
_textBox.ForeColor = lineColor;
}
void textBox_KeyDown(object sender, KeyEventArgs e)
private void textBox_KeyDown(object sender, KeyEventArgs e)
{
// ESC and Enter/Return (w/o Shift) hide text editor
if (e.KeyCode == Keys.Escape || ((e.KeyCode == Keys.Return || e.KeyCode == Keys.Enter) && e.Modifiers == Keys.None))
@ -477,7 +483,7 @@ namespace Greenshot.Drawing
}
}
void textBox_LostFocus(object sender, EventArgs e)
private void textBox_LostFocus(object sender, EventArgs e)
{
// next change will be made undoable
makeUndoable = true;