mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-21 17:30:15 +00:00
Merge branch 'KDE/4.14'
This commit is contained in:
commit
abd114f710
|
@ -771,7 +771,8 @@ void DolphinMainWindow::togglePanelLockState()
|
|||
void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool visible)
|
||||
{
|
||||
foreach (DolphinTabPage* tabPage, m_viewTab) {
|
||||
tabPage->setPlacesSelectorVisible(visible);
|
||||
// The Places selector in the location bar should be shown if and only if the Places panel is hidden.
|
||||
tabPage->setPlacesSelectorVisible(!visible);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -76,6 +76,10 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled)
|
|||
if (enabled) {
|
||||
const KUrl& url = m_primaryViewContainer->url();
|
||||
m_secondaryViewContainer = createViewContainer(url);
|
||||
|
||||
const bool placesSelectorVisible = m_primaryViewContainer->urlNavigator()->isPlacesSelectorVisible();
|
||||
m_secondaryViewContainer->urlNavigator()->setPlacesSelectorVisible(placesSelectorVisible);
|
||||
|
||||
m_splitter->addWidget(m_secondaryViewContainer);
|
||||
m_secondaryViewContainer->show();
|
||||
m_secondaryViewContainer->setActive(true);
|
||||
|
|
Loading…
Reference in a new issue