diff options
| -rw-r--r-- | core/src/renderer/null.rs | 4 | ||||
| -rw-r--r-- | core/src/text/editor.rs | 4 | ||||
| -rw-r--r-- | examples/editor/src/main.rs | 1 | ||||
| -rw-r--r-- | graphics/src/text/editor.rs | 6 | ||||
| -rw-r--r-- | widget/src/text_editor.rs | 45 |
5 files changed, 38 insertions, 22 deletions
diff --git a/core/src/renderer/null.rs b/core/src/renderer/null.rs index 75a3c8b6..83688ff7 100644 --- a/core/src/renderer/null.rs +++ b/core/src/renderer/null.rs @@ -150,6 +150,10 @@ impl text::Editor for () { Size::ZERO } + fn min_bounds(&self) -> Size { + Size::ZERO + } + fn update( &mut self, _new_bounds: Size, diff --git a/core/src/text/editor.rs b/core/src/text/editor.rs index f3c6e342..fbf60696 100644 --- a/core/src/text/editor.rs +++ b/core/src/text/editor.rs @@ -36,6 +36,10 @@ pub trait Editor: Sized + Default { /// Returns the current boundaries of the [`Editor`]. fn bounds(&self) -> Size; + /// Returns the minimum boundaries to fit the current contents of + /// the [`Editor`]. + fn min_bounds(&self) -> Size; + /// Updates the [`Editor`] with some new attributes. fn update( &mut self, diff --git a/examples/editor/src/main.rs b/examples/editor/src/main.rs index bf2aaaa3..75b66264 100644 --- a/examples/editor/src/main.rs +++ b/examples/editor/src/main.rs @@ -191,6 +191,7 @@ impl Application for Editor { column![ controls, text_editor(&self.content) + .height(Length::Fill) .on_action(Message::ActionPerformed) .highlight::<Highlighter>( highlighter::Settings { diff --git a/graphics/src/text/editor.rs b/graphics/src/text/editor.rs index d5262ae8..c488a51c 100644 --- a/graphics/src/text/editor.rs +++ b/graphics/src/text/editor.rs @@ -470,6 +470,12 @@ impl editor::Editor for Editor { self.internal().bounds } + fn min_bounds(&self) -> Size { + let internal = self.internal(); + + text::measure(internal.editor.buffer()) + } + fn update( &mut self, new_bounds: Size, diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs index 33793c92..cbcab1eb 100644 --- a/widget/src/text_editor.rs +++ b/widget/src/text_editor.rs @@ -64,7 +64,7 @@ where text_size: None, line_height: LineHeight::default(), width: Length::Fill, - height: Length::Fill, + height: Length::Shrink, padding: Padding::new(5.0), style: Default::default(), on_edit: None, @@ -83,6 +83,12 @@ where Theme: StyleSheet, Renderer: text::Renderer, { + /// Sets the height of the [`TextEditor`]. + pub fn height(mut self, height: impl Into<Length>) -> Self { + self.height = height.into(); + self + } + /// Sets the message that should be produced when some action is performed in /// the [`TextEditor`]. /// @@ -139,17 +145,6 @@ where self.style = style.into(); self } - - /// Choose whether or not to shrink the size of the editor to its contents. - pub fn shrink_to_content(mut self, shrink: bool) -> Self { - if shrink { - self.height = Length::Shrink; - } else { - self.height = Length::Fill; - } - - self - } } /// The content of a [`TextEditor`]. @@ -363,6 +358,8 @@ where state.highlighter_settings = self.highlighter_settings.clone(); } + let limits = limits.height(self.height); + internal.editor.update( limits.shrink(self.padding).max(), self.font.unwrap_or_else(|| renderer.default_font()), @@ -371,16 +368,20 @@ where state.highlighter.borrow_mut().deref_mut(), ); - if self.height == Length::Fill { - layout::Node::new(limits.max()) - } else { - let lines_height = self - .line_height - .to_absolute(self.text_size.unwrap_or(renderer.default_size())) - .0 - * internal.editor.line_count() as f32; - let height = lines_height + self.padding.top + self.padding.bottom; - layout::Node::new(limits.max_height(height).max()) + match self.height { + Length::Fill | Length::FillPortion(_) | Length::Fixed(_) => { + layout::Node::new(limits.max()) + } + Length::Shrink => { + let min_bounds = internal.editor.min_bounds(); + + layout::Node::new( + limits + .height(min_bounds.height) + .max() + .expand(Size::new(0.0, self.padding.vertical())), + ) + } } } |