Avoid recursively updating item preview with display commands

hluk · Nov 23, 2024 · 9f7c98c · 9f7c98c
1 parent df487eb
commit 9f7c98c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -572,6 +572,7 @@ MainWindow::MainWindow(const ClipboardBrowserSharedPtr &sharedData, QWidget *par
 
     ui->dockWidgetItemPreview->setFocusProxy(ui->scrollAreaItemPreview);
     ui->dockWidgetItemPreview->hide();
+    ui->scrollAreaItemPreview->viewport()->setObjectName("item_preview");
 
     WindowGeometryGuard::create(this);
     restoreState( mainWindowState(objectName()) );

diff --git a/src/item/itemdelegate.cpp b/src/item/itemdelegate.cpp
@@ -117,6 +117,13 @@ void ItemDelegate::rowsMoved(const QModelIndex &, int sourceStart, int sourceEnd
 }
 
 QWidget *ItemDelegate::createPreview(const QVariantMap &data, QWidget *parent)
+{
+    auto widget = createPreviewNoEmit(data, parent);
+    emit itemWidgetCreated(PersistentDisplayItem(this, data, widget));
+    return widget;
+}
+
+QWidget *ItemDelegate::createPreviewNoEmit(const QVariantMap &data, QWidget *parent)
 {
     const bool antialiasing = m_sharedData->theme.isAntialiasingEnabled();
     ItemWidget *itemWidget =
@@ -131,8 +138,6 @@ QWidget *ItemDelegate::createPreview(const QVariantMap &data, QWidget *parent)
 
     parent->setFocusProxy( itemWidget->widget() );
 
-    emit itemWidgetCreated(PersistentDisplayItem(this, data, itemWidget->widget()));
-
     return itemWidget->widget();
 }
 
@@ -173,7 +178,7 @@ void ItemDelegate::updateWidget(QObject *widget, const QVariantMap &data)
         if (!scrollArea)
             return;
 
-        auto newPreview = createPreview(data, scrollArea);
+        auto newPreview = createPreviewNoEmit(data, scrollArea);
         scrollArea->setWidget(newPreview);
         newPreview->show();
         return;

diff --git a/src/item/itemdelegate.h b/src/item/itemdelegate.h
@@ -127,6 +127,8 @@ class ItemDelegate final : public QItemDelegate
             QSize size = QSize(0, defaultItemHeight);
         };
 
+        QWidget *createPreviewNoEmit(const QVariantMap &data, QWidget *parent);
+
         void setIndexWidget(const QModelIndex &index, ItemWidget *w);
 
         /// Updates style for selected/unselected widgets.