Fixed editor's selection outline

Merge branch 'fix-selection-outline' into develop

classes/parser/convert/bitmaphelper.cpp

@@ -22,6 +22,7 @@
 
 #include <QPainter>
 #include <QPainterPath>
+#include <QPainterPathStroker>
 #include <QtSvg/QSvgRenderer>
 
 namespace Parsing
@@ -207,7 +208,7 @@ QImage BitmapHelper::drawGrid(const QImage *source, int scale)
   return result;
 }
 
-QImage BitmapHelper::drawSelection(const QImage *source, const QPainterPath &selectedPath)
+QImage BitmapHelper::drawSelection(const QImage *source, const QPainterPath &selectedPath, int scale)
 {
   QImage image = *source;
   QPixmap pixmap = QPixmap::fromImage(image);
@@ -216,12 +217,31 @@ QImage BitmapHelper::drawSelection(const QImage *source, const QPainterPath &sel
   QColor selectionBorderColor = QColor(0, 0, 248, 128);
   QBrush selectionFillBrush(QColor(64, 128, 248, 128));
 
+  QTransform transform;
+  transform = transform.scale((float)scale, (float)scale);
+  painter.setTransform(transform);
+
   painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
   painter.setRenderHint(QPainter::Antialiasing, false);
   painter.setRenderHint(QPainter::HighQualityAntialiasing, false);
   painter.setPen(selectionBorderColor);
   painter.setBrush(selectionFillBrush);
-  painter.drawPath(selectedPath);
+
+  painter.fillPath(selectedPath, selectionFillBrush);
+
+  if (scale > 5) {
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setRenderHint(QPainter::HighQualityAntialiasing, true);
+
+    QPainterPathStroker stroker;
+    float offset = 1.0f / (float)scale;
+    stroker.setWidth(offset * 2.0f);
+    stroker.setJoinStyle(Qt::RoundJoin);
+    stroker.setDashPattern(Qt::DashLine);
+
+    QPainterPath strokedPath = stroker.createStroke(selectedPath);
+    painter.fillPath(strokedPath, QBrush(selectionBorderColor));
+  }
 
   return pixmap.toImage();
 }

classes/parser/convert/bitmaphelper.h

@@ -55,7 +55,7 @@ class BitmapHelper
   static void findEmptyArea(const QImage *source, int *left, int *top, int *right, int *bottom);
   static QImage scale(const QImage *source, int scale);
   static QImage drawGrid(const QImage *source, int scale);
-  static QImage drawSelection(const QImage *source, const QPainterPath &selectedPath);
+  static QImage drawSelection(const QImage *source, const QPainterPath &selectedPath, int scale);
   static QImage drawPixel(const QImage *source, int x, int y, const QColor &color);
   static QColor detectBackgroundColor(const QImage *image);
   static QImage fromSvg(const QString &path, int size);

controls/imageeditor/windoweditor.cpp

@@ -185,9 +185,9 @@ void WindowEditor::updateImageScaled(int value)
   if (!this->mImageOriginal.isNull()) {
     QImage image = this->mImageOriginal;
 
-    image = Parsing::Conversion::BitmapHelper::drawSelection(&image, this->mTools->selectedPath());
     image = Parsing::Conversion::BitmapHelper::scale(&image, value);
     image = Parsing::Conversion::BitmapHelper::drawGrid(&image, value);
+    image = Parsing::Conversion::BitmapHelper::drawSelection(&image, this->mTools->selectedPath(), value);
     this->mImageScaled = image;
     this->mPixmapScaled = QPixmap::fromImage(image);
 

resources/history.xml

@@ -19,6 +19,7 @@
             <item category="fixed">Losing of empty parameters in Image settings block.</item>
             <item category="fixed">Selection of template files in the settings.</item>
             <item category="fixed">Clear the fill mask when changing the data block size.</item>
+            <item category="fixed">Editor's selection outline.</item>
             <item category="removed">Support for Qt version &lt; 5.5.</item>
             <item category="removed">Ability to hide toolbars.</item>
         </changes>