From a6b4348ddbc8fdf64ddb2c454e7fa2179e82c61b Mon Sep 17 00:00:00 2001 From: Ilia Kats Date: Mon, 9 Dec 2024 11:31:44 +0000 Subject: Fix inline renaming multiple files when renaming changes sorting order Suppose we are renaming file i and the new name will be sorted after file i+1. We are now pressing ArrowDown to immediately start renaming file i+1. However, because of the sorting we would not actually end up renaming what used to be file i+1. What would happen is that editing would be started in dolphinview.cpp:2065. However, after 100 ms the timer in KFileItemModel would fire, resulting in the model emitting itemsMoved(). This would trigger doLayout() in KItemListView::slotItemsMoved(). doLayout() resizes the KItemListWidgets, wich causes the renaming to be canceled in KStandardItemListWidget::resizeEvent(). Now, we start a new renaming operation for the correct widget after the relayouting is complete. --- src/tests/dolphinmainwindowtest.cpp | 56 +++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'src/tests') diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp index 6ac85e4f0..f620cb6ba 100644 --- a/src/tests/dolphinmainwindowtest.cpp +++ b/src/tests/dolphinmainwindowtest.cpp @@ -13,7 +13,9 @@ #include "kitemviews/kitemlistcontainer.h" #include "kitemviews/kitemlistcontroller.h" #include "kitemviews/kitemlistselectionmanager.h" +#include "kitemviews/kitemlistwidget.h" #include "testdir.h" +#include "views/dolphinitemlistview.h" #include #include @@ -55,6 +57,7 @@ private Q_SLOTS: void testOpenFiles(); void testAccessibilityTree(); void testAutoSaveSession(); + void testInlineRename(); void cleanupTestCase(); private: @@ -881,6 +884,59 @@ void DolphinMainWindowTest::testAutoSaveSession() m_mainWindow->setSessionAutoSaveEnabled(false); } +void DolphinMainWindowTest::testInlineRename() +{ + QScopedPointer testDir{new TestDir()}; + testDir->createFiles({"aaaa", "bbbb", "cccc", "dddd"}); + m_mainWindow->openDirectories({testDir->url()}, false); + m_mainWindow->show(); + QVERIFY(QTest::qWaitForWindowExposed(m_mainWindow.data())); + QVERIFY(m_mainWindow->isVisible()); + + DolphinView *view = m_mainWindow->activeViewContainer()->view(); + QSignalSpy viewDirectoryLoadingCompletedSpy(view, &DolphinView::directoryLoadingCompleted); + QSignalSpy itemsReorderedSpy(view->m_model, &KFileItemModel::itemsMoved); + QSignalSpy modelDirectoryLoadingCompletedSpy(view->m_model, &KFileItemModel::directoryLoadingCompleted); + + QVERIFY(viewDirectoryLoadingCompletedSpy.wait()); + QTest::qWait(500); // we need to wait for the file widgets to become visible + view->markUrlsAsSelected({QUrl(testDir->url().toString() + "/aaaa")}); + view->updateViewState(); + view->renameSelectedItems(); + QTest::keyClick(QApplication::focusWidget(), Qt::Key_Left); + QTest::keyClick(QApplication::focusWidget(), Qt::Key_E); + QTest::keyClick(QApplication::focusWidget(), Qt::Key_Down); + + QVERIFY(itemsReorderedSpy.wait()); + QVERIFY(view->m_view->m_editingRole); + KItemListWidget *widget = view->m_view->m_visibleItems.value(view->m_view->firstVisibleIndex()); + QVERIFY(!widget->editedRole().isEmpty()); + + QTest::keyClick(QApplication::focusWidget(), Qt::Key_Left); + QTest::keyClick(QApplication::focusWidget(), Qt::Key_A); + QTest::keyClick(QApplication::focusWidget(), Qt::Key_Down); + QTest::keyClick(QApplication::focusWidget(), Qt::Key_Down); + QTest::keyClick(QApplication::focusWidget(), Qt::Key_Left); + QTest::keyClick(QApplication::focusWidget(), Qt::Key_A); + QTest::keyClick(QApplication::focusWidget(), Qt::Key_Down); + + QVERIFY(itemsReorderedSpy.wait()); + QVERIFY(view->m_view->m_editingRole); + widget = view->m_view->m_visibleItems.value(view->m_view->lastVisibleIndex()); + QVERIFY(!widget->editedRole().isEmpty()); + + QTest::keyClick(QApplication::focusWidget(), Qt::Key_Escape); + QVERIFY(widget->isCurrent()); + view->m_model->refreshDirectory(testDir->url()); + QVERIFY(modelDirectoryLoadingCompletedSpy.wait()); + + QCOMPARE(view->m_model->fileItem(0).name(), "abbbb"); + QCOMPARE(view->m_model->fileItem(1).name(), "adddd"); + QCOMPARE(view->m_model->fileItem(2).name(), "cccc"); + QCOMPARE(view->m_model->fileItem(3).name(), "eaaaa"); + QCOMPARE(view->m_model->count(), 4); +} + void DolphinMainWindowTest::cleanupTestCase() { m_mainWindow->showNormal(); -- cgit v1.3