From 06f3c60be83614cf76dc6605505c288e22edb8f0 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 13 Nov 2023 18:56:59 -0700 Subject: [PATCH] Fix action dispatching... --- crates/editor2/src/editor.rs | 2 +- crates/gpui2/src/window.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs index 20b970d6720ec890e69b54aa5330e6035a0cc538..0995bbd5340240968c7957c36b194554eb21c679 100644 --- a/crates/editor2/src/editor.rs +++ b/crates/editor2/src/editor.rs @@ -9383,7 +9383,7 @@ impl Render for Editor { color: cx.theme().colors().text, font_family: "Zed Sans".into(), // todo!() font_features: FontFeatures::default(), - font_size: rems(1.0).into(), + font_size: settings.ui_font_size.into(), font_weight: FontWeight::NORMAL, font_style: FontStyle::Normal, line_height: relative(1.3).into(), // TODO relative(settings.buffer_line_height.value()), diff --git a/crates/gpui2/src/window.rs b/crates/gpui2/src/window.rs index 425fb9510fdfd8f17cd113ca2c8d3ab57895f5fe..450b36ea81b15848e08725a0038933f2756da252 100644 --- a/crates/gpui2/src/window.rs +++ b/crates/gpui2/src/window.rs @@ -424,6 +424,7 @@ impl<'a> WindowContext<'a> { .dispatch_tree .focusable_node_id(focus_handle.id) { + cx.propagate_event = true; cx.dispatch_action_on_node(node_id, action); } })