kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-21 17:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'KDE/4.14'

Browse source
This commit is contained in:
Frank Reininghaus 2014-07-16 09:16:24 +02:00
parent ebae393190 7cb193de10
commit abd114f710
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dolphinmainwindow.cpp
View file

@ -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);
}
}

4
src/dolphintabpage.cpp
View file

@ -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);