diff --git a/libimageviewer/viewpanel/contents/bottomtoolbar.cpp b/libimageviewer/viewpanel/contents/bottomtoolbar.cpp index 9afffe88..852a14ff 100644 --- a/libimageviewer/viewpanel/contents/bottomtoolbar.cpp +++ b/libimageviewer/viewpanel/contents/bottomtoolbar.cpp @@ -256,11 +256,12 @@ void LibBottomToolbar::checkAdaptScreenBtn() void LibBottomToolbar::deleteImage() { - if (m_imgListWidget->getImgCount() == 0) - return; //移除正在展示照片 if (m_imgListWidget) { - QString path = m_imgListWidget->getCurrentPath(); + if (m_imgListWidget->getImgCount() == 0) + return; + + QString path = getCurrentItemInfo().path; QFile file(path); if (!file.exists()) { @@ -373,7 +374,7 @@ void LibBottomToolbar::onTrashBtnClicked() //更换删除顺序,相册需要现在显示删除,再删除本体 QString path; if (m_imgListWidget) { - path = m_imgListWidget->getCurrentPath(); + path = getCurrentItemInfo().path; } if (path.isEmpty() && m_currentpath.isEmpty()) { path = m_currentpath; diff --git a/libimageviewer/viewpanel/contents/imgviewlistview.cpp b/libimageviewer/viewpanel/contents/imgviewlistview.cpp index 2414c41a..e8e406db 100644 --- a/libimageviewer/viewpanel/contents/imgviewlistview.cpp +++ b/libimageviewer/viewpanel/contents/imgviewlistview.cpp @@ -289,10 +289,17 @@ void LibImgViewListView::slotOneImgReady(QString path, imageViewerSpace::ItemInf if (data.path == path) { pix.imgWidth = data.imgWidth; pix.imgHeight = data.imgHeight; -// cutPixmap(pix); + + // 更新文件信息 QVariant meta; meta.setValue(pix); m_model->setData(index, meta, Qt::DisplayRole); + + // 判断当前的文件路径是否变更(重命名时),若变更则更新 + if (path == m_currentPath && pix.path != m_currentPath) { + m_currentPath = pix.path; + } + this->update(index); this->viewport()->update(); break;