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

BUG-1711: Fix for a stacktrace, as something was accessed before it was drawn.

Browse source
This commit is contained in:
RKrom 2014-12-01 17:21:01 +01:00
parent 089eec769e
commit bba978c209
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Greenshot/Drawing/DrawableContainer.cs
View file

@ -290,7 +290,9 @@ namespace Greenshot.Drawing {
} }
public virtual void Invalidate() { public virtual void Invalidate() {
_parent.Invalidate(DrawingBounds); if (Status != EditStatus.UNDRAWN) {
_parent.Invalidate(DrawingBounds);
}
} }
public void AlignToParent(HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment) { public void AlignToParent(HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment) {

13
Greenshot/Drawing/SpeechbubbleContainer.cs
View file

@ -133,13 +133,16 @@ namespace Greenshot.Drawing {
/// </summary> /// </summary>
public override Rectangle DrawingBounds { public override Rectangle DrawingBounds {
get { get {
int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS); if (Status != EditStatus.UNDRAWN) {
Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR); int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS);
using (Pen pen = new Pen(lineColor, lineThickness)) { Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR);
using (GraphicsPath tailPath = CreateTail()) { using (Pen pen = new Pen(lineColor, lineThickness)) {
return Rectangle.Inflate(Rectangle.Union(Rectangle.Round(tailPath.GetBounds(new Matrix(), pen)),GuiRectangle.GetGuiRectangle(Left, Top, Width, Height)), lineThickness+2, lineThickness+2); using (GraphicsPath tailPath = CreateTail()) {
return Rectangle.Inflate(Rectangle.Union(Rectangle.Round(tailPath.GetBounds(new Matrix(), pen)), GuiRectangle.GetGuiRectangle(Left, Top, Width, Height)), lineThickness + 2, lineThickness + 2);
}
} }
} }
return Rectangle.Empty;
} }
} }