From 2ba38b2fca3ed315b92b8e16d2e0994997b52c96 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Tue, 14 Mar 2023 00:42:15 -0700 Subject: [PATCH] Change icon width to scale with font size --- crates/editor/src/editor.rs | 2 +- crates/theme/src/theme.rs | 2 +- styles/src/styleTree/editor.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 7f60309f6a..66169be652 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -2746,7 +2746,7 @@ impl Editor { .color, ) .constrained() - .with_width(style.icon_width) + .with_width(gutter_margin * style.icon_margin_scale) .aligned() .constrained() .with_height(line_height) diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index dcaf2a9c90..6ffce22cc3 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -666,7 +666,7 @@ pub struct Folds { pub indicator: Interactive, pub ellipses: FoldEllipses, pub fold_background: Color, - pub icon_width: f32, + pub icon_margin_scale: f32, pub folded_icon: String, pub foldable_icon: String, } diff --git a/styles/src/styleTree/editor.ts b/styles/src/styleTree/editor.ts index 64a19d714f..4a7aae4c1b 100644 --- a/styles/src/styleTree/editor.ts +++ b/styles/src/styleTree/editor.ts @@ -60,7 +60,7 @@ export default function editor(colorScheme: ColorScheme) { verticalScale: 0.55, }, folds: { - iconWidth: 8, + iconMarginScale: 2.5, foldedIcon: "icons/chevron_right_8.svg", foldableIcon: "icons/chevron_down_8.svg", indicator: {