fix: image selection has been disabled for the MVP to solve resizing …

…and translation issues
Onetchou · Apr 7, 2024 · 8ef9b54 · 8ef9b54
1 parent 363197a
commit 8ef9b54
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 28 deletions.
diff --git a/src/app/seamly2d/mainwindow.cpp b/src/app/seamly2d/mainwindow.cpp
@@ -1688,11 +1688,12 @@ void  MainWindow::addImage(DraftImage image)
     draftScene->addItem(item);
     //Need error dialog
 
-    connect(this, &MainWindow::EnableImageSelection, item, &ImageItem::enableSelection);
+    //connect(this, &MainWindow::EnableImageSelection, item, &ImageItem::enableSelection);
+    //connect(this, &MainWindow::EnableImageHover, item, &ImageItem::enableHovering);
 
     connect(item, &ImageItem::deleteImage, this, &MainWindow::handleDeleteImage);
-    connect(item, &ImageItem::imageSelected, this, &MainWindow::handleImageSelected);
-	connect(item, &ImageItem::setStatusMessage, this, &MainWindow::setStatusMessage);
+    //connect(item, &ImageItem::imageSelected, this, &MainWindow::handleImageSelected);
+    connect(item, &ImageItem::setStatusMessage, this, &MainWindow::setStatusMessage);
 
     ui->importImage_ToolButton->setChecked(false);
 

diff --git a/src/libs/tools/image_item.cpp b/src/libs/tools/image_item.cpp
@@ -70,7 +70,6 @@ ImageItem::ImageItem(DraftImage image, QGraphicsItem *parent)
     , m_angleHandle()
     , m_angle()
     , m_mousePressed(false)
-    , m_isResizing (false)
     , m_isHovered(false)
     , m_selectionType(SelectionType::ByMouseRelease)
     , m_transformationMode(Qt::SmoothTransformation)
@@ -174,7 +173,8 @@ void ImageItem::setLock(bool checked)
         setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton);
     }
     setFlag(QGraphicsItem::ItemIsMovable, !m_image.locked);
-    setFlag(QGraphicsItem::ItemIsSelectable, !m_image.locked);
+    //enableSelection(!m_image.locked);
+    enableHovering(!m_image.locked);
     emit imageUpdated(m_image);
 }
 
@@ -212,8 +212,14 @@ void ImageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 void ImageItem::enableSelection(bool enable)
 {
     m_selectable = enable;
-    setFlag(QGraphicsItem::ItemSendsGeometryChanges, m_selectable);
-    setFlag(QGraphicsItem::ItemIsFocusable, m_selectable);
+    setFlag(QGraphicsItem::ItemIsSelectable, enable);
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------
+void ImageItem::enableHovering(bool enable)
+{
+    setAcceptHoverEvents(enable);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -394,10 +400,6 @@ void ImageItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
         scene()->clearSelection();
     }
     m_mousePressed = true;
-    if (m_isResizing)
-    {
-      m_actualRect = m_boundingRect;
-    }
 
     if (flags() & QGraphicsItem::ItemIsMovable)
     {
@@ -453,7 +455,6 @@ void ImageItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     }
 
     m_mousePressed = false;
-    m_isResizing = false;
 
     QGraphicsItem::mouseReleaseEvent(event);
 }
@@ -475,12 +476,13 @@ void ImageItem::keyReleaseEvent(QKeyEvent *event)
 }
 
 void ImageItem::initializeItem()
-{
-    this->setFlag(QGraphicsItem::ItemIsMovable, true);
-    this->setFlag(QGraphicsItem::ItemIsSelectable, true);
-    this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
-    this->setFlag(QGraphicsItem::ItemIsFocusable, true);// For keyboard input focus
-    this->setAcceptHoverEvents(true);
+{ 
+    setFlag(QGraphicsItem::ItemIsMovable, true);
+    setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+    setFlag(QGraphicsItem::ItemIsFocusable, true); // For keyboard input focus
+    setFlag(QGraphicsItem::ItemIsSelectable, false);
+    //enableSelection(false);
+    enableHovering(true);
 }
 
 void ImageItem::updateFromHandles(QRectF rect)

diff --git a/src/libs/tools/image_item.h b/src/libs/tools/image_item.h
@@ -81,6 +81,7 @@ class ImageItem : public QObject, public QGraphicsItem
     void             setLock(bool checked);
 
     void             enableSelection(bool enable);
+    void             enableHovering(bool enable);
 
 signals:
     void             imageUpdated(DraftImage image);
@@ -110,7 +111,6 @@ class ImageItem : public QObject, public QGraphicsItem
     QPolygonF          m_angleHandle;
     qreal              m_angle;
     bool               m_mousePressed;
-    bool               m_isResizing;
     bool               m_isHovered;
     SelectionType      m_selectionType;
     bool               m_transformationMode;

diff --git a/src/libs/vwidgets/resize_handle.cpp b/src/libs/vwidgets/resize_handle.cpp
@@ -550,15 +550,6 @@ void ResizeHandlesItem::HandleItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *ev
 //---------------------------------------------------------------------------------------------------------------------
 void ResizeHandlesItem::HandleItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-    //if (isSelected())
-    //{
-        if (event->button() == Qt::LeftButton && event->type() != QEvent::GraphicsSceneMouseDoubleClick)
-        {
-        }
-
-        //emit handleSelected(m_handlePosition, true);
-    //}
-
     m_scalingFactor = m_parent->m_parentRect.width() / m_parent->m_parentRect.height();
 
     QGraphicsItem::mousePressEvent(event);