kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert some hunks from previous commit

Browse source 
Changes in folderspanel.cpp in 464b13f382 were unintended.
This commit is contained in:
Kevin Funk 2017-11-21 11:00:07 +01:00
parent a6db5029ac
commit f024c3c01f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/panels/folders/folderspanel.cpp
View file

@ -91,7 +91,7 @@ void FoldersPanel::setLimitFoldersPanelToHome(bool enable)
bool FoldersPanel::limitFoldersPanelToHome() const bool FoldersPanel::limitFoldersPanelToHome() const
{ {
return limitFoldersPanelToHome(); return FoldersPanelSettings::limitFoldersPanelToHome();
} }
void FoldersPanel::setAutoScrolling(bool enable) void FoldersPanel::setAutoScrolling(bool enable)
@ -325,7 +325,7 @@ void FoldersPanel::loadTree(const QUrl& url)
QUrl baseUrl; QUrl baseUrl;
if (url.isLocalFile()) { if (url.isLocalFile()) {
const bool isInHomeFolder = Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url); const bool isInHomeFolder = Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url);
if (limitFoldersPanelToHome() && isInHomeFolder) { if (FoldersPanelSettings::limitFoldersPanelToHome() && isInHomeFolder) {
baseUrl = Dolphin::homeUrl(); baseUrl = Dolphin::homeUrl();
} else { } else {
// Use the root directory as base for local URLs (#150941) // Use the root directory as base for local URLs (#150941)