Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui: Don't break flex layout when using WithRemSize (#12076)

Browse source 
This PR fixes an issue where the flex hierarchy wasn't getting broken by
the use of `WithRemSize`.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-05-20 21:39:18 -04:00 • committed by GitHub
parent 315e45f543
commit 2f3102672c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ui/src/components/context_menu.rs
View file

@ -269,7 +269,7 @@ impl Render for ContextMenu {
let ui_font_size = ThemeSettings::get_global(cx).ui_font_size; let ui_font_size = ThemeSettings::get_global(cx).ui_font_size;
div().occlude().elevation_2(cx).flex().flex_row().child( div().occlude().elevation_2(cx).flex().flex_row().child(
WithRemSize::new(ui_font_size).child( WithRemSize::new(ui_font_size).flex().child(
v_flex() v_flex()
.min_w(px(200.)) .min_w(px(200.))
.track_focus(&self.focus_handle) .track_focus(&self.focus_handle)

8
crates/ui/src/with_rem_size.rs
View file

@ -1,6 +1,6 @@
use gpui::{ use gpui::{
div, AnyElement, Bounds, Div, DivFrameState, Element, ElementId, GlobalElementId, Hitbox, div, AnyElement, Bounds, Div, DivFrameState, Element, ElementId, GlobalElementId, Hitbox,
IntoElement, LayoutId, ParentElement, Pixels, WindowContext, IntoElement, LayoutId, ParentElement, Pixels, StyleRefinement, Styled, WindowContext,
}; };
/// An element that sets a particular rem size for its children. /// An element that sets a particular rem size for its children.
@ -18,6 +18,12 @@ impl WithRemSize {
} }
} }
impl Styled for WithRemSize {
fn style(&mut self) -> &mut StyleRefinement {
self.div.style()
}
}
impl ParentElement for WithRemSize { impl ParentElement for WithRemSize {
fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) { fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
self.div.extend(elements) self.div.extend(elements)