Fix creating single instance of an item list at start

hluk · Dec 20, 2023 · df7b714 · df7b714
1 parent 95657ab
commit df7b714
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 23 deletions.
diff --git a/src/gui/clipboardbrowser.cpp b/src/gui/clipboardbrowser.cpp
@@ -1671,7 +1671,6 @@ bool ClipboardBrowser::loadItems()
         return false;
 
     d.rowsInserted(QModelIndex(), 0, m.rowCount());
-    emit itemsLoaded(this);
     if ( hasFocus() )
         setCurrent(0);
     onItemCountChanged();

diff --git a/src/gui/clipboardbrowser.h b/src/gui/clipboardbrowser.h
@@ -238,8 +238,6 @@ class ClipboardBrowser final : public QListView
 
         void itemsChanged(const ClipboardBrowser *self);
 
-        void itemsLoaded(const ClipboardBrowser *self);
-
         void itemSelectionChanged(const ClipboardBrowser *self);
 
         void internalEditorStateChanged(const ClipboardBrowser *self);

diff --git a/src/gui/clipboardbrowserplaceholder.cpp b/src/gui/clipboardbrowserplaceholder.cpp
@@ -37,7 +37,6 @@ ClipboardBrowser *ClipboardBrowserPlaceholder::createBrowser()
         return nullptr;
 
     std::unique_ptr<ClipboardBrowser> c( new ClipboardBrowser(m_tabName, m_sharedData, this) );
-    emit browserCreated(c.get());
 
     c->setStoreItems(m_storeItems);
     c->setMaxItemCount(m_maxItemCount);
@@ -57,6 +56,7 @@ ClipboardBrowser *ClipboardBrowserPlaceholder::createBrowser()
 
     restartExpiring();
 
+    emit browserCreated(m_browser);
     return m_browser;
 }
 

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -1268,25 +1268,7 @@ void MainWindow::onBrowserCreated(ClipboardBrowser *browser)
              this, &MainWindow::onSearchShowRequest );
     connect( browser, &ClipboardBrowser::itemWidgetCreated,
              this, &MainWindow::onItemWidgetCreated );
-    connect( browser, &ClipboardBrowser::itemsLoaded,
-             this, &MainWindow::onBrowserItemsLoaded );
 
-    if (browserOrNull() == browser) {
-        const int index = ui->tabWidget->currentIndex();
-        tabChanged(index, index);
-    }
-}
-
-void MainWindow::onBrowserDestroyed(ClipboardBrowserPlaceholder *placeholder)
-{
-    if (placeholder == getPlaceholder()) {
-        updateContextMenu(0);
-        updateItemPreviewAfterMs(0);
-    }
-}
-
-void MainWindow::onBrowserItemsLoaded(const ClipboardBrowser *browser)
-{
     if (isScriptOverridden(ScriptOverrides::OnItemsLoaded)) {
         runEventHandlerScript(
             QStringLiteral("onItemsLoaded()"),
@@ -1311,6 +1293,19 @@ void MainWindow::onBrowserItemsLoaded(const ClipboardBrowser *browser)
                         browser, topLeft.row(), bottomRight.row());
                     }
              } );
+
+    if (browserOrNull() == browser) {
+        const int index = ui->tabWidget->currentIndex();
+        tabChanged(index, index);
+    }
+}
+
+void MainWindow::onBrowserDestroyed(ClipboardBrowserPlaceholder *placeholder)
+{
+    if (placeholder == getPlaceholder()) {
+        updateContextMenu(0);
+        updateItemPreviewAfterMs(0);
+    }
 }
 
 void MainWindow::onItemSelectionChanged(const ClipboardBrowser *browser)

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
@@ -499,7 +499,6 @@ class MainWindow final : public QMainWindow
 
     void onBrowserCreated(ClipboardBrowser *browser);
     void onBrowserDestroyed(ClipboardBrowserPlaceholder *placeholder);
-    void onBrowserItemsLoaded(const ClipboardBrowser *browser);
 
     void onItemSelectionChanged(const ClipboardBrowser *browser);
     void onItemsChanged(const ClipboardBrowser *browser);