Merge pull request #7568 from nextcloud/bugfix/remove-content-margins…

…-account-settings-tablayout gui: Remove content margins account settings subsections
nextcloud · Dec 9, 2024 · 65c1407 · 65c1407
2 parents f240cd9 + 65ab4b3
commit 65c1407
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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);
 

diff --git 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: ""