lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

settings: badges no longer create extra top/bottom padding so the layout stays clean

Browse Source
This commit is contained in:
Lemmy
2026-05-06 09:19:36 -04:00
parent 20dd6faad5
commit ac5cec5738
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell/settings/bar_widget_editor.cpp
+4 -4
View File
@@ -1088,7 +1088,7 @@ namespace settings {
auto kindBadge = std::make_unique<Flex>();
kindBadge->setAlign(FlexAlign::Center);
kindBadge->setPadding(1.0f * ctx.scale, Style::spaceXs * ctx.scale);
kindBadge->setPadding(0, Style::spaceXs * ctx.scale);
kindBadge->setRadius(Style::radiusSm * ctx.scale);
kindBadge->setFill(widgetBadgeColor(info.kind));
kindBadge->addChild(
@@ -1623,7 +1623,7 @@ namespace settings {
if (overridden) {
auto badge = std::make_unique<Flex>();
badge->setAlign(FlexAlign::Center);
badge->setPadding(1.0f * ctx.scale, Style::spaceXs * ctx.scale);
badge->setPadding(0, Style::spaceXs * ctx.scale);
badge->setRadius(Style::radiusSm * ctx.scale);
badge->setFill(colorSpecFromRole(ColorRole::Primary, 0.15f));
badge->addChild(makeLabel(i18n::tr("settings.badges.override"), Style::fontSizeCaption * ctx.scale,
@@ -1633,7 +1633,7 @@ namespace settings {
if (inherited) {
auto badge = std::make_unique<Flex>();
badge->setAlign(FlexAlign::Center);
badge->setPadding(1.0f * ctx.scale, Style::spaceXs * ctx.scale);
badge->setPadding(0, Style::spaceXs * ctx.scale);
badge->setRadius(Style::radiusSm * ctx.scale);
badge->setFill(colorSpecFromRole(ColorRole::OnSurfaceVariant, 0.14f));
badge->addChild(makeLabel(i18n::tr("settings.badges.inherited"), Style::fontSizeCaption * ctx.scale,
@@ -1688,7 +1688,7 @@ namespace settings {
}
auto kindBadge = std::make_unique<Flex>();
kindBadge->setAlign(FlexAlign::Center);
kindBadge->setPadding(1.0f * ctx.scale, Style::spaceXs * ctx.scale);
kindBadge->setPadding(0, Style::spaceXs * ctx.scale);
kindBadge->setRadius(Style::radiusSm * ctx.scale);
kindBadge->setFill(widgetBadgeColor(info.kind));
kindBadge->addChild(
src/shell/settings/settings_content.cpp
+2 -2
View File
@@ -455,7 +455,7 @@ namespace settings {
const auto makeBadge = [&](std::string_view label, const ColorSpec& fill, const ColorSpec& color) {
auto badge = std::make_unique<Flex>();
badge->setAlign(FlexAlign::Center);
badge->setPadding(1.0f * scale, Style::spaceXs * scale);
badge->setPadding(0, Style::spaceXs * scale);
badge->setRadius(Style::radiusSm * scale);
badge->setFill(fill);
badge->addChild(makeLabel(label, Style::fontSizeCaption * scale, color, true));
@@ -803,7 +803,7 @@ namespace settings {
const auto makeBadge = [&](std::string_view label, const ColorSpec& fill, const ColorSpec& color) {
auto badge = std::make_unique<Flex>();
badge->setAlign(FlexAlign::Center);
badge->setPadding(1.0f * scale, Style::spaceXs * scale);
badge->setPadding(0, Style::spaceXs * scale);
badge->setRadius(Style::radiusSm * scale);
badge->setFill(fill);
badge->addChild(makeLabel(label, Style::fontSizeCaption * scale, color, true));