SerophotsandAntonio Scandurra
a3ac595737
## Motivating problem
The gpui API currently has this counter intuitive behaviour
```rust
div()
.id("hallo")
.cursor_pointer()
.text_color(white())
.font_weight(FontWeight::SEMIBOLD)
.text_size(px(20.0))
.child("hallo")
.active(|this| this.text_color(red()))
```
By changing the text_color when the div is active, the current behaviour
is to overwrite all of the text styling rather than do a proper
refinement of the existing text styling leading to this odd result:
The button being active inadvertently changes the font size.
https://github.com/user-attachments/assets/1ff51169-0d76-4ee5-bbb0-004eb9ffdf2c
## Solution
Previously refining a Style would not recursively refine the TextStyle
inside of it, leading to this behaviour:
```rust
let mut style = Style::default();
style.refine(&StyleRefinement::default().text_size(px(20.0)));
style.refine(&StyleRefinement::default().font_weight(FontWeight::SEMIBOLD));
assert!(style.text_style().unwrap().font_size.is_none());
//assertion passes
```
(As best as I can tell) Style deliberately has `pub text:
TextStyleRefinement` storing the `TextStyleRefinement` rather than the
absolute `TextStyle` so that these refinements can be elsewhere used in
cascading text styles down to element's children. But a consequence of
that is that the refine macro was not properly recursively refining the
`text` field as it ought to.
I've modified the refine macro so that the `#[refineable]` attribute
works with `TextStyleRefinement` as well as the usual `TextStyle`.
(Perhaps a little bit haphazardly by simply checking whether the name
ends in Refinement - there may be a better solution there).
This PR resolves the motivating problem and triggers the assertion in
the above code as you'd expect. I've compiled zed under these changes
and all seems to be in order there.
Release Notes:
- N/A
---------
Co-authored-by: Antonio Scandurra <me@as-cii.com>
114 lines
4.0 KiB
Rust
114 lines
4.0 KiB
Rust
use assets::Assets;
|
|
use gpui::{Application, Entity, KeyBinding, Length, StyleRefinement, WindowOptions, rgb};
|
|
use language::LanguageRegistry;
|
|
use markdown::{Markdown, MarkdownElement, MarkdownStyle};
|
|
use node_runtime::NodeRuntime;
|
|
use settings::SettingsStore;
|
|
use std::sync::Arc;
|
|
use theme::LoadThemes;
|
|
use ui::div;
|
|
use ui::prelude::*;
|
|
|
|
const MARKDOWN_EXAMPLE: &str = r#"
|
|
this text should be selectable
|
|
|
|
wow so cool
|
|
|
|
## Heading 2
|
|
"#;
|
|
pub fn main() {
|
|
env_logger::init();
|
|
|
|
Application::new().with_assets(Assets).run(|cx| {
|
|
let store = SettingsStore::test(cx);
|
|
cx.set_global(store);
|
|
cx.bind_keys([KeyBinding::new("cmd-c", markdown::Copy, None)]);
|
|
|
|
let node_runtime = NodeRuntime::unavailable();
|
|
let language_registry = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
|
|
let fs = fs::FakeFs::new(cx.background_executor().clone());
|
|
languages::init(language_registry, fs, node_runtime, cx);
|
|
theme::init(LoadThemes::JustBase, cx);
|
|
Assets.load_fonts(cx).unwrap();
|
|
|
|
cx.activate(true);
|
|
let _ = cx.open_window(WindowOptions::default(), |_, cx| {
|
|
cx.new(|cx| {
|
|
let markdown = cx.new(|cx| Markdown::new(MARKDOWN_EXAMPLE.into(), None, None, cx));
|
|
|
|
HelloWorld { markdown }
|
|
})
|
|
});
|
|
});
|
|
}
|
|
struct HelloWorld {
|
|
markdown: Entity<Markdown>,
|
|
}
|
|
|
|
impl Render for HelloWorld {
|
|
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let markdown_style = MarkdownStyle {
|
|
base_text_style: gpui::TextStyle {
|
|
font_family: "Zed Mono".into(),
|
|
color: cx.theme().colors().text,
|
|
..Default::default()
|
|
},
|
|
code_block: StyleRefinement {
|
|
text: gpui::TextStyleRefinement {
|
|
font_family: Some("Zed Mono".into()),
|
|
background_color: Some(cx.theme().colors().editor_background),
|
|
..Default::default()
|
|
},
|
|
margin: gpui::EdgesRefinement {
|
|
top: Some(Length::Definite(rems(4.).into())),
|
|
left: Some(Length::Definite(rems(4.).into())),
|
|
right: Some(Length::Definite(rems(4.).into())),
|
|
bottom: Some(Length::Definite(rems(4.).into())),
|
|
},
|
|
..Default::default()
|
|
},
|
|
inline_code: gpui::TextStyleRefinement {
|
|
font_family: Some("Zed Mono".into()),
|
|
background_color: Some(cx.theme().colors().editor_background),
|
|
..Default::default()
|
|
},
|
|
rule_color: Color::Muted.color(cx),
|
|
block_quote_border_color: Color::Muted.color(cx),
|
|
block_quote: gpui::TextStyleRefinement {
|
|
color: Some(Color::Muted.color(cx)),
|
|
..Default::default()
|
|
},
|
|
link: gpui::TextStyleRefinement {
|
|
color: Some(Color::Accent.color(cx)),
|
|
underline: Some(gpui::UnderlineStyle {
|
|
thickness: px(1.),
|
|
color: Some(Color::Accent.color(cx)),
|
|
wavy: false,
|
|
}),
|
|
..Default::default()
|
|
},
|
|
syntax: cx.theme().syntax().clone(),
|
|
selection_background_color: cx.theme().colors().element_selection_background,
|
|
heading: Default::default(),
|
|
..Default::default()
|
|
};
|
|
|
|
div()
|
|
.flex()
|
|
.bg(rgb(0x2e7d32))
|
|
.size(Length::Definite(px(700.0).into()))
|
|
.justify_center()
|
|
.items_center()
|
|
.shadow_lg()
|
|
.border_1()
|
|
.border_color(rgb(0x0000ff))
|
|
.text_xl()
|
|
.text_color(rgb(0xffffff))
|
|
.child(
|
|
div()
|
|
.child(MarkdownElement::new(self.markdown.clone(), markdown_style))
|
|
.p_20(),
|
|
)
|
|
}
|
|
}
|