Skip to content

fix: separate rounded navigation panel and adjust settings dialog styling #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rello merged 1 commit into from
Jan 14, 2026
+12 −5
Merged

fix: separate rounded navigation panel and adjust settings dialog styling #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/gui/settingsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2013 ownCloud GmbH
Expand Down Expand Up @@ -37,10 +37,10 @@
namespace {
const QString TOOLBAR_CSS()
{
return QStringLiteral("QToolBar { background: %1; margin: 0; padding: 0; border: none; spacing: 0; } "
"QToolBar QToolButton { background: %1; border: none; margin: 0; padding: 8px 12px; font-size: 14px; } "
return QStringLiteral("QToolBar { background: transparent; margin: 0; padding: 0; border: none; spacing: 0; } "
"QToolBar QToolButton { background: transparent; border: none; margin: 0; padding: 8px 12px; font-size: 14px; } "
"QToolBar QToolBarExtension { padding:0; } "
"QToolBar QToolButton:checked { background: %3; color: %4; }");
"QToolBar QToolButton:checked { background: %3; color: %4; border-radius: 8px; margin: 4px 8px; }");
}

const float buttonSizeRatio = 1.618f; // golden ratio
Expand Down Expand Up @@ -92,7 +92,13 @@
auto *shellLayout = new QHBoxLayout(shellContainer);
shellLayout->setContentsMargins(12, 12, 12, 12);
shellLayout->setSpacing(12);
shellLayout->addWidget(_toolBar);
auto *navigationContainer = new QWidget(this);

Check warning on line 95 in src/gui/settingsdialog.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/settingsdialog.cpp:95:11 [cppcoreguidelines-init-variables] 

variable 'navigationContainer' is not initialized
navigationContainer->setObjectName(QLatin1String("settings_navigation"));
auto *navigationLayout = new QVBoxLayout(navigationContainer);

Check warning on line 97 in src/gui/settingsdialog.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/settingsdialog.cpp:97:11 [cppcoreguidelines-init-variables] 

variable 'navigationLayout' is not initialized
navigationLayout->setContentsMargins(0, 0, 0, 0);
navigationLayout->setSpacing(0);
navigationLayout->addWidget(_toolBar);
shellLayout->addWidget(navigationContainer);
shellLayout->addWidget(_ui->stack);
shellLayout->setStretch(0, 0);
shellLayout->setStretch(1, 1);
Expand Down Expand Up @@ -166,7 +172,8 @@
cfg.restoreGeometry(this);
setStyleSheet(QStringLiteral(
"#Settings { background: #f2f2f2; }"
"#settings_shell { background: #e7e7e7; border-radius: 12px; }"
"#settings_shell { background: transparent; border-radius: 0; }"
"#settings_navigation { background: #e7e7e7; border-radius: 12px; }"
"#generalGroupBox, #advancedGroupBox, #aboutAndUpdatesGroupBox,"
"#accountStatusPanel, #accountStoragePanel, #accountTabsPanel {"
" background: #f2f2f2; border-radius: 10px; border: none; }"
Expand Down
Loading