dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resizable: Fix the edge case of initializing Panels with zero initial_size (#377)

Browse source
This commit is contained in:
xda 2024-10-24 01:07:45 +09:00 committed by GitHub
parent 53311b06f8
commit b8c8ddd8f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/ui/src/resizable/panel.rs
View file

@ -2,7 +2,7 @@ use std::rc::Rc;
use gpui::{ use gpui::{
canvas, div, prelude::FluentBuilder, px, relative, Along, AnyElement, AnyView, Axis, Bounds, canvas, div, prelude::FluentBuilder, px, relative, Along, AnyElement, AnyView, Axis, Bounds,
Element, Entity, EntityId, EventEmitter, IntoElement, MouseMoveEvent, MouseUpEvent, Element, Entity, EntityId, EventEmitter, IntoElement, IsZero, MouseMoveEvent, MouseUpEvent,
ParentElement, Pixels, Render, StatefulInteractiveElement as _, Style, Styled, View, ParentElement, Pixels, Render, StatefulInteractiveElement as _, Style, Styled, View,
ViewContext, VisualContext as _, WindowContext, ViewContext, VisualContext as _, WindowContext,
}; };
@ -362,10 +362,16 @@ impl Render for ResizablePanel {
.when(self.axis.is_vertical(), |this| this.min_h(PANEL_MIN_SIZE)) .when(self.axis.is_vertical(), |this| this.min_h(PANEL_MIN_SIZE))
.when(self.axis.is_horizontal(), |this| this.min_w(PANEL_MIN_SIZE)) .when(self.axis.is_horizontal(), |this| this.min_w(PANEL_MIN_SIZE))
.when_some(self.initial_size, |this, size| { .when_some(self.initial_size, |this, size| {
// The `self.size` is None, that mean the initial size for the panel, so we need set flex_shrink_0 if size.is_zero() {
// To let it keep the initial size. this
this.when(self.size.is_none(), |this| this.flex_shrink_0()) } else {
// The `self.size` is None, that mean the initial size for the panel, so we need set flex_shrink_0
// To let it keep the initial size.
this.when(self.size.is_none() && size > px(0.), |this| {
this.flex_shrink_0()
})
.flex_basis(size) .flex_basis(size)
}
}) })
.map(|this| match (self.size_ratio, self.size, total_size) { .map(|this| match (self.size_ratio, self.size, total_size) {
(Some(size_ratio), _, _) => this.flex_basis(relative(size_ratio)), (Some(size_ratio), _, _) => this.flex_basis(relative(size_ratio)),