diff options
| author | Frank Reininghaus <[email protected]> | 2013-10-26 09:24:04 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2013-10-26 09:24:04 +0200 |
| commit | f55119945f0edc369b53c64b45ae117dc73ff426 (patch) | |
| tree | 848d3f45981b8a73f2a4483bbcbd0dd1f9cfe3e6 /src/dolphinmainwindow.h | |
| parent | 96ba990d865b2dfb966961061ba5154dcd3187b4 (diff) | |
Fix broken view state restoration
The fix for bug 161385 (which was about Dolphin still showing an empty
view if a device that had been unmounted earlier was clicked in the
Places Panel) caused a regression: the view state (current item, scroll
position, Details View expansion state) was not restored any more when
going "Back".
The reason is that "m_view->reload()" in
DolphinViewContainer::setUrl(const KUrl& newUrl) was always executed
just after entering a directory, and that command overwrites this
information.
Distinguishing between "change URL" and "reload the view" works better
if it's done in DolphinMainWindow instead of DolphinViewContainer.
BUG: 326039
FIXED-IN: 4.11.3
REVIEW: 113290
Diffstat (limited to 'src/dolphinmainwindow.h')
| -rw-r--r-- | src/dolphinmainwindow.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 7da5801ff..6b046c2ea 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -466,6 +466,13 @@ private slots: */ void slotPanelErrorMessage(const QString& error); + /** + * Is called if the user clicked an item in the Places Panel. + * Reloads the view if \a url is the current URL already, and changes the + * current URL otherwise. + */ + void slotPlaceActivated(const KUrl& url); + private: /** * Activates the given view, which means that |