mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Revert some hunks from previous commit
Changes in folderspanel.cpp in 464b13f382
were unintended.
This commit is contained in:
parent
a6db5029ac
commit
f024c3c01f
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue