From 567f2858acc260023c3e64112097f0dc1a39ea55 Mon Sep 17 00:00:00 2001 From: Amol Godbole Date: Tue, 1 Aug 2023 09:59:57 +0000 Subject: Fix incorrect file selection after file rename forceUrlsSelection() needs to be called only when new name of renamed file does not exist. BUG: 417930 --- src/views/dolphinview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/views/dolphinview.cpp') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 9666ca2ab..fba7e6419 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -2063,9 +2063,9 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray &role, con KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job); job->uiDelegate()->setAutoErrorHandlingEnabled(true); - forceUrlsSelection(newUrl, {newUrl}); - if (!newNameExistsAlready) { + forceUrlsSelection(newUrl, {newUrl}); + // Only connect the result signal if there is no item with the new name // in the model yet, see bug 328262. connect(job, &KJob::result, this, &DolphinView::slotRenamingResult); -- cgit v1.3 From c1b260524381c4ac19d8055a4f716723ab7fb649 Mon Sep 17 00:00:00 2001 From: Amol Godbole Date: Thu, 3 Aug 2023 10:44:20 +0000 Subject: DolphinView: initialize m_controlWheelAccumulatedDelta Ctrl + scroll wheel zoom was not working as designed after Dolphin is launched. Initialize m_controlWheelAccumulatedDelta in DolphinView's constructor. BUG: 469354 --- src/views/dolphinview.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/views/dolphinview.cpp') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index fba7e6419..13c8b4df2 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -92,6 +92,7 @@ DolphinView::DolphinView(const QUrl &url, QWidget *parent) , m_currentItemUrl() , m_scrollToCurrentItem(false) , m_restoredContentsPosition() + , m_controlWheelAccumulatedDelta(0) , m_selectedUrls() , m_clearSelectionBeforeSelectingNewItems(false) , m_markFirstNewlySelectedItemAsCurrent(false) -- cgit v1.3