diff options
| -rw-r--r-- | src/dolphintabpage.cpp | 9 | ||||
| -rw-r--r-- | src/dolphintabpage.h | 6 | ||||
| -rw-r--r-- | src/dolphintabwidget.cpp | 14 |
3 files changed, 17 insertions, 12 deletions
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index c8da707df..2979cb568 100644 --- a/src/dolphintabpage.cpp +++ b/src/dolphintabpage.cpp @@ -164,6 +164,15 @@ DolphinViewContainer *DolphinTabPage::activeViewContainer() const return m_primaryViewActive ? m_primaryViewContainer : m_secondaryViewContainer; } +DolphinViewContainer *DolphinTabPage::inactiveViewContainer() const +{ + if (!splitViewEnabled()) { + return nullptr; + } + + return primaryViewActive() ? secondaryViewContainer() : primaryViewContainer(); +} + KFileItemList DolphinTabPage::selectedItems() const { KFileItemList items = m_primaryViewContainer->view()->selectedItems(); diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h index 1c8ae094b..4e89d22ee 100644 --- a/src/dolphintabpage.h +++ b/src/dolphintabpage.h @@ -67,6 +67,12 @@ public: DolphinViewContainer *activeViewContainer() const; /** + * @return DolphinViewContainer of the inactive view + * if split view is enabled, or nullptr otherwise. + */ + DolphinViewContainer *inactiveViewContainer() const; + + /** * Returns the selected items. The list is empty if no item has been * selected. */ diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index 9ee80160a..d4271847f 100644 --- a/src/dolphintabwidget.cpp +++ b/src/dolphintabwidget.cpp @@ -335,12 +335,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 +351,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()); } |