From 97ec6077a47a4d0f889002bf82a8c03dc663a13b Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 26 Nov 2024 14:35:27 +0800 Subject: [PATCH 1/2] Set margins on account settings internal layouts as 0 to match folder tree for vfs and connection settings Signed-off-by: Claudio Cambra --- src/gui/accountsettings.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 6a7051a092a27..986ca7f8786f0 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -205,6 +205,7 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) const auto fpAccountUserIdAtHost = _accountState->account()->userIdAtHostWithPort(); const auto fpSettingsController = Mac::FileProviderSettingsController::instance(); const auto fpSettingsWidget = fpSettingsController->settingsViewWidget(fpAccountUserIdAtHost, fileProviderTab); + fpSettingsLayout->setContentsMargins(0, 0, 0, 0); fpSettingsLayout->addWidget(fpSettingsWidget); fileProviderTab->setLayout(fpSettingsLayout); } @@ -220,6 +221,7 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) const auto connectionSettingsTab = _ui->connectionSettingsTab; const auto connectionSettingsLayout = new QVBoxLayout(connectionSettingsTab); const auto networkSettings = new NetworkSettings(_accountState->account(), connectionSettingsTab); + connectionSettingsLayout->setContentsMargins(0, 0, 0, 0); connectionSettingsLayout->addWidget(networkSettings); connectionSettingsTab->setLayout(connectionSettingsLayout); From 942b32601f6bfb4d32f13ffae5a85abeb7120b71 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 26 Nov 2024 14:35:40 +0800 Subject: [PATCH 2/2] Disable border on file provider settings page by default Signed-off-by: Claudio Cambra --- src/gui/macOS/ui/FileProviderSettings.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/macOS/ui/FileProviderSettings.qml b/src/gui/macOS/ui/FileProviderSettings.qml index 35b51f43246b4..e7d2e1ee5fbd2 100644 --- a/src/gui/macOS/ui/FileProviderSettings.qml +++ b/src/gui/macOS/ui/FileProviderSettings.qml @@ -25,7 +25,7 @@ import com.nextcloud.desktopclient 1.0 Page { id: root - property bool showBorder: true + property bool showBorder: false property var controller: FileProviderSettingsController property string accountUserIdAtHost: ""