diff options
| author | Luca Beltrame <[email protected]> | 2014-07-16 10:13:57 +0200 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2014-07-16 10:13:57 +0200 |
| commit | e242d9548d11d92568a648efece5ff6c280b36cd (patch) | |
| tree | 414cc5b1eb313abf6b52ce978ee61e1f649167c3 /src/dolphinmainwindow.cpp | |
| parent | fc4315d57e8fe64d05aad2a1c24800f0149b21da (diff) | |
| parent | abd114f710b9d1247ecea4a82fb338492e9caf78 (diff) | |
Merge branch 'master' into frameworks
Conflicts:
kdepasswd/kcm/kcm_useraccount.desktop [deleted in frameworks branch]
plasma/applets/folderview/plasma-applet-folderview.desktop [deleted in frameworks branch]
Diffstat (limited to 'src/dolphinmainwindow.cpp')
| -rw-r--r-- | src/dolphinmainwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 3b084ac8b..fce99bb58 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -775,7 +775,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); } } |