mirror of
https://github.com/zed-industries/zed.git
synced 2025-01-29 21:49:33 +00:00
ui: Don't break flex layout when using WithRemSize
(#12076)
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:
parent
315e45f543
commit
2f3102672c
2 changed files with 8 additions and 2 deletions
|
@ -269,7 +269,7 @@ impl Render for ContextMenu {
|
|||
let ui_font_size = ThemeSettings::get_global(cx).ui_font_size;
|
||||
|
||||
div().occlude().elevation_2(cx).flex().flex_row().child(
|
||||
WithRemSize::new(ui_font_size).child(
|
||||
WithRemSize::new(ui_font_size).flex().child(
|
||||
v_flex()
|
||||
.min_w(px(200.))
|
||||
.track_focus(&self.focus_handle)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use gpui::{
|
||||
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.
|
||||
|
@ -18,6 +18,12 @@ impl WithRemSize {
|
|||
}
|
||||
}
|
||||
|
||||
impl Styled for WithRemSize {
|
||||
fn style(&mut self) -> &mut StyleRefinement {
|
||||
self.div.style()
|
||||
}
|
||||
}
|
||||
|
||||
impl ParentElement for WithRemSize {
|
||||
fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
|
||||
self.div.extend(elements)
|
||||
|
|
Loading…
Reference in a new issue