From d521efd8432aa7905ef61eb8f717be469a6ccebe Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 14 Oct 2025 11:14:16 -0300
Subject: [PATCH] settings_ui: Only allow to reset a setting to default in the
file in which it was customized (#40182)
Plus some other tiny visual adjustments.
Release Notes:
- N/A
---
assets/icons/undo.svg | 5 ++++-
crates/settings_ui/src/settings_ui.rs | 11 ++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/assets/icons/undo.svg b/assets/icons/undo.svg
index c714b58747e950ab75d3a02be7eebfe7cd83eda1..ccd45e246c6911c57cb2659764db6e1dc11bf0cb 100644
--- a/assets/icons/undo.svg
+++ b/assets/icons/undo.svg
@@ -1 +1,4 @@
-
+
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 363d1e5c7401e9a153a0c1e6c65dc6dc11222986..8dba6ff9886cb4acb14437955a0513fabbf84d87 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -734,18 +734,19 @@ fn render_settings_item(
.when_some(
setting_item
.field
- .reset_to_default_fn(&file, &found_in_file, cx),
+ .reset_to_default_fn(&file, &found_in_file, cx)
+ .filter(|_| file_set_in.as_ref() == Some(&file)),
|this, reset_to_default| {
this.child(
IconButton::new("reset-to-default-btn", IconName::Undo)
.icon_color(Color::Muted)
- .size(ButtonSize::Compact)
+ .icon_size(IconSize::Small)
+ .tooltip(Tooltip::text("Reset to Default"))
.on_click({
move |_, _, cx| {
reset_to_default(cx);
}
- })
- .tooltip(Tooltip::text("Reset to default")),
+ }),
)
},
)
@@ -754,7 +755,7 @@ fn render_settings_item(
|this, file_set_in| {
this.child(
Label::new(format!(
- "— set in {}",
+ "— Modified in {}",
settings_window
.display_name(&file_set_in)
.expect("File name should exist")