[neon/backports-jammy/kimageannotator/Neon/release] /: New upstream version 0.3.1

[Boyuan Yang]

Git commit 4bf05536acf4d7bee9862162bd91385966a3d888 by Boyuan Yang.
Committed on 28/06/2020 at 22:07.
Pushed by jriddell into branch 'Neon/release'.

New upstream version 0.3.1

M  +1    -0    CHANGELOG.md
M  +3    -1    src/annotations/core/AnnotationPropertiesFactory.cpp

https://invent.kde.org/neon/backports-jammy/kimageannotator/-/commit/4bf05536acf4d7bee9862162bd91385966a3d888

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 377f6c4..0c08a75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Fixed: Snap lines to degrees not working when CTRL pressed before clicking annotation area. ([#113](https://github.com/ksnip/kImageAnnotator/issues/113))
 * Fixed: "Border and Fill" submenu cutting off text under windows. ([#117](https://github.com/ksnip/kImageAnnotator/issues/117))
 * Fixed: Undo removes several or all items. ([#121](https://github.com/ksnip/kImageAnnotator/issues/121))
+* Fixed: Marker Rect and Ellipse draw only border but no fill. ([#126](https://github.com/ksnip/kImageAnnotator/issues/126))
 
 ## Release 0.3.0
 * New: Tabs for images. ([#48](https://github.com/ksnip/kImageAnnotator/issues/48))
diff --git a/src/annotations/core/AnnotationPropertiesFactory.cpp b/src/annotations/core/AnnotationPropertiesFactory.cpp
index f12d3d2..b532c10 100644
--- a/src/annotations/core/AnnotationPropertiesFactory.cpp
+++ b/src/annotations/core/AnnotationPropertiesFactory.cpp
@@ -99,9 +99,11 @@ void AnnotationPropertiesFactory::setFill(const PropertiesPtr &properties, ToolT
 {
 	switch (toolType) {
 		case ToolTypes::MarkerPen:
+			properties->setFillType(FillTypes::BorderAndNoFill);
+			break;
 		case ToolTypes::MarkerRect:
 		case ToolTypes::MarkerEllipse:
-			properties->setFillType(FillTypes::BorderAndNoFill);
+			properties->setFillType(FillTypes::NoBorderAndFill);
 			break;
 		case ToolTypes::Image:
 		case ToolTypes::Sticker: