From 2bca7bd6918b4372fc8f02e46f4b672db80568c3 Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Wed, 31 Jul 2024 20:21:10 +0800 Subject: [PATCH] fix: move to trash not reload current item --- app/mainwindow.cpp | 12 ++++++------ app/mainwindow.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp index 62ab3ba..3e28251 100644 --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -140,8 +140,8 @@ MainWindow::MainWindow(QWidget *parent) m_nextButton->setVisible(galleryFileCount > 1); }); - connect(m_pm->model(), &PlaylistModel::modelReset, this, std::bind(&MainWindow::galleryCurrent, this, false)); - connect(m_pm, &PlaylistManager::currentIndexChanged, this, std::bind(&MainWindow::galleryCurrent, this, true)); + connect(m_pm->model(), &PlaylistModel::modelReset, this, std::bind(&MainWindow::galleryCurrent, this, false, false)); + connect(m_pm, &PlaylistManager::currentIndexChanged, this, std::bind(&MainWindow::galleryCurrent, this, true, false)); QShortcut * fullscreenShorucut = new QShortcut(QKeySequence(QKeySequence::FullScreen), this); connect(fullscreenShorucut, &QShortcut::activated, @@ -253,12 +253,12 @@ void MainWindow::galleryNext() } } -// Only use this to update minor information. Do NOT use this to load image -// because it might cause an image gets loaded multiple times. -void MainWindow::galleryCurrent(bool showLoadImageHintWhenEmpty) +// Only use this to update minor information. +void MainWindow::galleryCurrent(bool showLoadImageHintWhenEmpty, bool reloadImage) { QModelIndex index = m_pm->curIndex(); if (index.isValid()) { + if (reloadImage) m_graphicsView->showFileFromPath(m_pm->localFileByIndex(index)); setWindowTitle(m_pm->urlByIndex(index).fileName()); } else if (showLoadImageHintWhenEmpty && m_pm->totalCount() <= 0) { m_graphicsView->showText(QCoreApplication::translate("GraphicsScene", "Drag image here")); @@ -765,7 +765,7 @@ void MainWindow::on_actionTrash_triggered() tr("Move to trash failed, it might caused by file permission issue, file system limitation, or platform limitation.")); } else { m_pm->removeAt(index); - galleryCurrent(true); + galleryCurrent(true, true); } } } diff --git a/app/mainwindow.h b/app/mainwindow.h index 514ee6d..fa087a9 100644 --- a/app/mainwindow.h +++ b/app/mainwindow.h @@ -44,7 +44,7 @@ public: void clearGallery(); void galleryPrev(); void galleryNext(); - void galleryCurrent(bool showLoadImageHintWhenEmpty); + void galleryCurrent(bool showLoadImageHintWhenEmpty, bool reloadImage); static QStringList supportedImageFormats();