diff options
| author | arnav dhamija <[email protected]> | 2017-02-13 22:24:01 +0530 |
|---|---|---|
| committer | arnav dhamija <[email protected]> | 2017-02-13 22:24:01 +0530 |
| commit | ccb3658b3aa7f5b0f0b71cb6e91808bdfe58af64 (patch) | |
| tree | cf6b1cd277d7a410278802aa600be0c65af6bd64 /src/dolphintabpage.cpp | |
| parent | 41253c0c81bafb54a0b6c82e5282e3add85e8a50 (diff) | |
| parent | 0d4924d8bbab256b13ae13040201bea7ea04ab2f (diff) | |
Merge branch 'stashAction'
This adds the support for the Stash action which will be helpful for the upcoming stash:/ ioslave
Diffstat (limited to 'src/dolphintabpage.cpp')
| -rw-r--r-- | src/dolphintabpage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index c674e1eb0..5c42d41ec 100644 --- a/src/dolphintabpage.cpp +++ b/src/dolphintabpage.cpp @@ -71,13 +71,13 @@ bool DolphinTabPage::splitViewEnabled() const return m_splitViewEnabled; } -void DolphinTabPage::setSplitViewEnabled(bool enabled) +void DolphinTabPage::setSplitViewEnabled(bool enabled, const QUrl &secondaryUrl) { if (m_splitViewEnabled != enabled) { m_splitViewEnabled = enabled; if (enabled) { - const QUrl& url = m_primaryViewContainer->url(); + const QUrl& url = (secondaryUrl.isEmpty()) ? m_primaryViewContainer->url() : secondaryUrl; m_secondaryViewContainer = createViewContainer(url); const bool placesSelectorVisible = m_primaryViewContainer->urlNavigator()->isPlacesSelectorVisible(); |
