Fix #97

Author: niello

src/ui/ResizableRectItem.h

@@ -40,7 +40,7 @@ class ResizableRectItem : public QGraphicsRectItem
     virtual QSizeF getMinSize() const { return QSizeF(1.0, 1.0); }
     virtual QSizeF getMaxSize() const { return QSizeF(std::numeric_limits<qreal>().max(), std::numeric_limits<qreal>().max()); }
 
-    void onScaleChanged(qreal scaleX, qreal scaleY);
+    virtual void onScaleChanged(qreal scaleX, qreal scaleY);
     void mouseReleaseEventSelected();
 
     virtual void notifyHandleSelected(ResizingHandle* /*handle*/) {}

src/ui/imageset/ImageEntry.cpp

@@ -69,6 +69,12 @@ void ImageEntry::notifyResizeFinished(QPointF newPos, QSizeF newSize)
     resized = true;
 }
 
+void ImageEntry::onScaleChanged(qreal scaleX, qreal scaleY)
+{
+    ResizableRectItem::onScaleChanged(scaleX, scaleY);
+    label->onScaleChanged(scaleX, scaleY);
+}
+
 void ImageEntry::loadFromElement(const QDomElement& xml)
 {
     setName(xml.attribute("name", "Unknown"));

src/ui/imageset/ImageEntry.h

@@ -20,6 +20,7 @@ class ImageEntry : public ResizableRectItem
     virtual QRectF constrainResizeRect(QRectF rect, QRectF oldRect) override;
     virtual void notifyResizeStarted() override;
     virtual void notifyResizeFinished(QPointF newPos, QSizeF newSize) override;
+    virtual void onScaleChanged(qreal scaleX, qreal scaleY) override;
 
     void loadFromElement(const QDomElement& xml);
     void saveToElement(QDomElement& xml);

src/ui/imageset/ImageLabel.cpp

@@ -6,14 +6,30 @@
 ImageLabel::ImageLabel(QGraphicsItem* parent)
     : QGraphicsTextItem(parent)
 {
-    setFlags(ItemIgnoresTransformations);
     setOpacity(0.8);
     setVisible(false);
     setPlainText("Unknown");
 
     // We make the label a lot more transparent when mouse is over it to make it easier
     // to work around the top edge of the image
     setAcceptHoverEvents(true);
+
+    setY(-boundingRect().height() - 2.0);
+}
+
+void ImageLabel::onScaleChanged(qreal scaleX, qreal scaleY)
+{
+    auto tfm = transform();
+
+    const qreal counterScaleX = (1.0 / scaleX);
+    const qreal counterScaleY = (1.0 / scaleY);
+
+    tfm = QTransform(counterScaleX, tfm.m12(), tfm.m13(),
+                     tfm.m21(), counterScaleY, tfm.m23(),
+                     tfm.m31(), tfm.m32(), tfm.m33());
+
+    setTransform(tfm);
+    setY((-boundingRect().height() - 2.0) * counterScaleY);
 }
 
 void ImageLabel::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)

src/ui/imageset/ImageLabel.h

@@ -12,6 +12,8 @@ class ImageLabel : public QGraphicsTextItem
 
     ImageLabel(QGraphicsItem* parent = nullptr);
 
+    void onScaleChanged(qreal scaleX, qreal scaleY);
+
 protected:
 
     virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;