Fix mirroring a piece label.

src/app/puzzle/scene/vpgraphicspiece.cpp

@@ -47,6 +47,7 @@
 
 #include "../vpapplication.h"
 
+#include "compatibility.h"
 #include "vlayoutpiecepath.h"
 #include "vplacelabelitem.h"
 
@@ -60,8 +61,82 @@ namespace
 {
 QColor mainColor = Qt::black;
 QColor errorColor = Qt::red;
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto LineMatrix(const VPPiecePtr &piece, const QPointF &topLeft, qreal angle, const QPointF &linePos,
+                       int maxLineWidth) -> QTransform
+{
+    if (piece.isNull())
+    {
+        return {};
     }
 
+    QTransform labelMatrix;
+    labelMatrix.translate(topLeft.x(), topLeft.y());
+
+    if (piece->IsMirror())
+    {
+        labelMatrix.scale(-1, 1);
+        labelMatrix.rotate(-angle);
+        labelMatrix.translate(-maxLineWidth, 0);
+    }
+    else
+    {
+        labelMatrix.rotate(angle);
+    }
+
+    labelMatrix.translate(linePos.x(), linePos.y()); // Each string has own position
+    labelMatrix *= piece->GetMatrix();
+
+    return labelMatrix;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto LineFont(const TextLine& tl, const QFont &base) -> QFont
+{
+    QFont fnt = base;
+    fnt.setPixelSize(base.pixelSize() + tl.m_iFontSize);
+    fnt.setBold(tl.m_bold);
+    fnt.setItalic(tl.m_italic);
+    return fnt;
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto LineText(const TextLine& tl, const QFontMetrics &fm, qreal width) -> QString
+{
+    QString qsText = tl.m_qsText;
+    if (TextWidth(fm, qsText) > width)
+    {
+        qsText = fm.elidedText(qsText, Qt::ElideMiddle, static_cast<int>(width));
+    }
+
+    return qsText;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto LineAlign(const TextLine& tl, const QString &text, const QFontMetrics &fm, qreal width) -> qreal
+{
+    const int lineWidth = TextWidth(fm, text);
+
+    qreal dX = 0;
+    if (tl.m_eAlign == 0 || (tl.m_eAlign & Qt::AlignLeft) > 0)
+    {
+        dX = 0;
+    }
+    else if ((tl.m_eAlign & Qt::AlignHCenter) > 0)
+    {
+        dX = (width - lineWidth)/2;
+    }
+    else if ((tl.m_eAlign & Qt::AlignRight) > 0)
+    {
+        dX = width - lineWidth;
+    }
+
+    return dX;
+}
+}  // namespace
+
 //---------------------------------------------------------------------------------------------------------------------
 VPGraphicsPiece::VPGraphicsPiece(const VPPiecePtr &piece, QGraphicsItem *parent) :
     QGraphicsObject(parent),
@@ -302,23 +377,24 @@ void VPGraphicsPiece::InitPieceLabel(const QVector<QPointF> &labelShape, const V
         return;
     }
 
-    if (labelShape.count() > 2)
+    if (labelShape.count() <= 2)
     {
+        return;
+    }
+
     const qreal dW = QLineF(labelShape.at(0), labelShape.at(1)).length();
     const qreal dH = QLineF(labelShape.at(1), labelShape.at(2)).length();
     const qreal angle = - QLineF(labelShape.at(0), labelShape.at(1)).angle();
+    const QColor color = PieceColor();
+    const int maxLineWidth = tm.MaxLineWidth(static_cast<int>(dW));
+
     qreal dY = 0;
-        QColor color = PieceColor();
 
     for (int i = 0; i < tm.GetSourceLinesCount(); ++i)
     {
         const TextLine& tl = tm.GetSourceLine(i);
-            QFont fnt = tm.GetFont();
+        const QFont fnt = LineFont(tl, tm.GetFont());
-            fnt.setPixelSize(tm.GetFont().pixelSize() + tl.m_iFontSize);
+        const QFontMetrics fm(fnt);
-            fnt.setBold(tl.m_bold);
-            fnt.setItalic(tl.m_italic);
-
-            QFontMetrics fm(fnt);
 
         if (m_textAsPaths)
         {
@@ -330,55 +406,10 @@ void VPGraphicsPiece::InitPieceLabel(const QVector<QPointF> &labelShape, const V
             break;
         }
 
-            QString qsText = tl.m_qsText;
+        const QString qsText = LineText(tl, fm, dW);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+        const qreal dX = LineAlign(tl, qsText, fm, dW);
-            if (fm.horizontalAdvance(qsText) > dW)
-#else
-            if (fm.width(qsText) > dW)
-#endif
-            {
-                qsText = fm.elidedText(qsText, Qt::ElideMiddle, static_cast<int>(dW));
-            }
-
-            qreal dX = 0;
-            if (tl.m_eAlign == 0 || (tl.m_eAlign & Qt::AlignLeft) > 0)
-            {
-                dX = 0;
-            }
-            else if ((tl.m_eAlign & Qt::AlignHCenter) > 0)
-            {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-                dX = (dW - fm.horizontalAdvance(qsText))/2;
-#else
-                dX = (dW - fm.width(qsText))/2;
-#endif
-            }
-            else if ((tl.m_eAlign & Qt::AlignRight) > 0)
-            {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-                dX = dW - fm.horizontalAdvance(qsText);
-#else
-                dX = dW - fm.width(qsText);
-#endif
-            }
-
         // set up the rotation around top-left corner matrix
-            QTransform labelMatrix;
+        const QTransform lineMatrix = LineMatrix(piece, labelShape.at(0), angle, QPointF(dX, dY), maxLineWidth);
-            labelMatrix.translate(labelShape.at(0).x(), labelShape.at(0).y());
-            if (piece->IsMirror())
-            {
-                labelMatrix.scale(-1, 1);
-                labelMatrix.rotate(-angle);
-                labelMatrix.translate(-dW, 0);
-                labelMatrix.translate(dX, dY); // Each string has own position
-            }
-            else
-            {
-                labelMatrix.rotate(angle);
-                labelMatrix.translate(dX, dY); // Each string has own position
-            }
-
-            labelMatrix *= piece->GetMatrix();
 
         if (m_textAsPaths)
         {
@@ -388,7 +419,7 @@ void VPGraphicsPiece::InitPieceLabel(const QVector<QPointF> &labelShape, const V
             auto* item = new QGraphicsPathItem(this);
             item->setPath(path);
             item->setBrush(QBrush(color));
-                item->setTransform(labelMatrix);
+            item->setTransform(lineMatrix);
             m_labelPathItems.append(item);
 
             dY += tm.GetSpacing();
@@ -399,14 +430,13 @@ void VPGraphicsPiece::InitPieceLabel(const QVector<QPointF> &labelShape, const V
             item->setFont(fnt);
             item->setText(qsText);
             item->setBrush(QBrush(color));
-                item->setTransform(labelMatrix);
+            item->setTransform(lineMatrix);
             m_labelTextItems.append(item);
 
             dY += (fm.height() + tm.GetSpacing());
         }
     }
 }
-}
 
 //---------------------------------------------------------------------------------------------------------------------
 void VPGraphicsPiece::PaintPiece(QPainter *painter)

src/libs/vlayout/vtextmanager.cpp

@@ -491,6 +491,34 @@ auto VTextManager::GetSourceLine(int i) const -> const TextLine&
     return m_liLines.at(i);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+auto VTextManager::MaxLineWidth(int width) const -> int
+{
+    int maxWidth = 0;
+    for (int i = 0; i < m_liLines.count(); ++i)
+    {
+        const TextLine& tl = m_liLines.at(i);
+
+        QFont fnt = m_font;
+        fnt.setPixelSize(fnt.pixelSize() + tl.m_iFontSize);
+        fnt.setBold(tl.m_bold);
+        fnt.setItalic(tl.m_italic);
+
+        QFontMetrics fm(fnt);
+
+        QString qsText = tl.m_qsText;
+
+        if (TextWidth(fm, qsText) > width)
+        {
+            qsText = fm.elidedText(qsText, Qt::ElideMiddle, width);
+        }
+
+        maxWidth = qMax(TextWidth(fm, qsText), maxWidth);
+    }
+
+    return maxWidth;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief VTextManager::FitFontSize sets the font size just big enough, so that the text fits into rectangle of

src/libs/vlayout/vtextmanager.h

@@ -90,6 +90,8 @@ public:
     auto GetSourceLinesCount() const -> int;
     auto GetSourceLine(int i) const -> const TextLine&;
 
+    auto MaxLineWidth(int width) const -> int;
+
     void Update(const QString& qsName, const VPieceLabelData& data, const VContainer *pattern);
     void Update(VAbstractPattern* pDoc, const VContainer *pattern);
 

src/libs/vmisc/compatibility.h

@@ -32,6 +32,7 @@
 #include <QStringList>
 #include <QSet>
 #include <QVector>
+#include <QFontMetrics>
 
 class QPointF;
 
@@ -253,4 +254,24 @@ inline auto SetIntersects(const QSet<T> &set1, const QSet<T> &set2) -> bool
 #endif
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+inline auto TextWidth(const QFontMetrics &fm, const QString &text, int len = -1) -> int
+{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+    return fm.horizontalAdvance(text, len);
+#else
+    return fm.width(text, len);
+#endif
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+inline auto TextWidthF(const QFontMetricsF &fm, const QString &text) -> qreal
+{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+    return fm.horizontalAdvance(text);
+#else
+    return fm.width(text);
+#endif
+}
+
 #endif // COMPATIBILITY_H