X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/78a3cd3e4bc75fc299a6b05b266bdd58fe7f8dcf..d9a18b04ea0b1b4e427f45083fdc0cdec87cbbfd:/src/dolphintabwidget.cpp

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 9ee80160a..89dd9feba 100644
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -15,6 +15,7 @@
 #include <KIO/CommandLauncherJob>
 #include <KLocalizedString>
 #include <KShell>
+#include <KStringHandler>
 #include <kio/global.h>
 
 #include <QApplication>
@@ -335,12 +336,7 @@ void DolphinTabWidget::copyToInactiveSplitView()
         return;
     }
 
-    DolphinView *inactiveView;
-    if (tabPage->primaryViewActive()) {
-        inactiveView = tabPage->secondaryViewContainer()->view();
-    } else {
-        inactiveView = tabPage->primaryViewContainer()->view();
-    }
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();
     inactiveView->copySelectedItems(selectedItems, inactiveView->url());
 }
 
@@ -356,12 +352,7 @@ void DolphinTabWidget::moveToInactiveSplitView()
         return;
     }
 
-    DolphinView *inactiveView;
-    if (tabPage->primaryViewActive()) {
-        inactiveView = tabPage->secondaryViewContainer()->view();
-    } else {
-        inactiveView = tabPage->primaryViewContainer()->view();
-    }
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();
     inactiveView->moveSelectedItems(selectedItems, inactiveView->url());
 }
 
@@ -517,7 +508,7 @@ QString DolphinTabWidget::tabName(DolphinTabPage *tabPage) const
 
     // Make sure that a '&' inside the directory name is displayed correctly
     // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
-    return name.replace('&', QLatin1String("&&"));
+    return KStringHandler::rsqueeze(name.replace('&', QLatin1String("&&")), 40 /* default maximum visible folder name visible */);
 }
 
 DolphinViewContainer *DolphinTabWidget::viewContainerAt(DolphinTabWidget::ViewIndex viewIndex) const
@@ -605,3 +596,5 @@ const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewSho
 
     return std::nullopt;
 }
+
+#include "moc_dolphintabwidget.cpp"