Skip to content

fix(ui): better autoupdate plugin ui #4140

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
ItsLemmy merged 3 commits into from
Sep 1, 2026
+14 −13
Merged

fix(ui): better autoupdate plugin ui #4140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2d51ed
fix(ui): better autoupdate plugin ui
AdityaKr015 Aug 28, 2026
d8ffbff
Merge branch 'main' into fix/wide-autoupdate-plugin-dropdown
AdityaKr015 Aug 28, 2026
88208c8
fix(settings): use a segmented control for plugin auto-update mode
ItsLemmy Sep 1, 2026
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
6 changes: 3 additions & 3 deletions assets/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,9 +1396,9 @@
},
"plugins": {
"auto-update": {
"all": "All sources",
"none": "None",
"official": "Official only"
"all": "All",
"official": "Official",
"none": "None"
}
},
"screen-position": {
Expand Down
21 changes: 11 additions & 10 deletions src/shell/settings/settings_content_plugins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ namespace settings {
return s.kind == PluginSourceKind::Git && s.enabled;
});
if (hasGitSource && ctx.setAutoUpdate) {
// Separate from the source list so the dropdown doesn't read as another source.
// Separate from the source list so the mode row doesn't read as another source.
section->addChild(ui::separator({.spacing = Style::spaceSm * scale}));
auto autoRow = ui::row({.align = FlexAlign::Center, .gap = Style::spaceSm * scale, .fillWidth = true});
auto autoInfo = ui::column({.align = FlexAlign::Start, .gap = 2.0F * scale, .flexGrow = 1.0F});
Expand All @@ -766,21 +766,22 @@ namespace settings {
i18n::tr("settings.plugins.sources.auto-update-desc"), Style::fontSizeCaption * scale,
ColorRole::OnSurfaceVariant
));
std::vector<SelectOption> modeOptions;
std::vector<ui::SegmentedOption> modeOptions;
modeOptions.reserve(std::size(kPluginAutoUpdateModes));
std::optional<std::size_t> selectedModeIndex;
for (const auto& opt : kPluginAutoUpdateModes) {
modeOptions.push_back(SelectOption{std::string(opt.key), i18n::tr(opt.labelKey)});
if (opt.value == ctx.autoUpdateMode) {
selectedModeIndex = modeOptions.size();
}
modeOptions.push_back(ui::SegmentedOption{.label = i18n::tr(opt.labelKey)});
}
const auto selectedModeIndex = optionIndex(modeOptions, enumToKey(kPluginAutoUpdateModes, ctx.autoUpdateMode));
autoRow->addChild(std::move(autoInfo));
autoRow->addChild(
ui::select({
.options = optionLabels(modeOptions),
ui::segmented({
.options = std::move(modeOptions),
.selectedIndex = selectedModeIndex,
.fontSize = Style::fontSizeBody * scale,
.controlHeight = Style::controlHeight * scale,
.glyphSize = Style::fontSizeBody * scale,
.onSelectionChanged = [cb = ctx.setAutoUpdate](std::size_t index, std::string_view /*label*/) {
.scale = scale,
.onChange = [cb = ctx.setAutoUpdate](std::size_t index) {
if (cb && index < std::size(kPluginAutoUpdateModes)) {
cb(kPluginAutoUpdateModes[index].value);
}
Expand Down
Loading