Garmelon/showbits
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak Widget naming and docs

Browse source
This commit is contained in:
Joscha 2024-03-05 00:42:05 +01:00
parent f3f8af39d4
commit 6b62c3fd54
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
showbits-common/src/widget.rs
View file

@ -5,15 +5,16 @@ pub trait Widget<C> {
/// constraints. /// constraints.
fn size(&self, max_width: Option<i32>, max_height: Option<i32>) -> Vec2; fn size(&self, max_width: Option<i32>, max_height: Option<i32>) -> Vec2;
/// Recalculate the size of all inner widgets given the widget's own size. /// Recalculate the area (size and position) of all inner widgets given the
/// widget's own area.
/// ///
/// # Implement if... /// # Implement if...
/// ///
/// - There are inner widgets /// - There are inner widgets
fn resize(&mut self, _area: Rect) {} fn set_area(&mut self, _area: Rect) {}
/// Perform any updates (e.g. fetching map tiles) that require the widget's /// Perform any updates (e.g. fetching map tiles) that require the widget's
/// size and may fail. /// area and may fail.
/// ///
/// # Implement if... /// # Implement if...
/// ///
@ -45,7 +46,7 @@ where
/// approach of `Box<Widget>`. /// approach of `Box<Widget>`.
trait WidgetWrapper<C> { trait WidgetWrapper<C> {
fn size(&self, max_width: Option<i32>, max_height: Option<i32>) -> Vec2; fn size(&self, max_width: Option<i32>, max_height: Option<i32>) -> Vec2;
fn resize(&mut self, _area: Rect); fn set_area(&mut self, _area: Rect);
fn update(&mut self, _area: Rect) -> anyhow::Result<()>; fn update(&mut self, _area: Rect) -> anyhow::Result<()>;
fn draw(self: Box<Self>, view: &mut View<'_, C>); fn draw(self: Box<Self>, view: &mut View<'_, C>);
} }
@ -59,8 +60,9 @@ impl<C, W: Widget<C>> WidgetWrapper<C> for W {
Widget::size(self, max_width, max_height) Widget::size(self, max_width, max_height)
} }
fn resize(&mut self, area: Rect) { fn set_area(&mut self, area: Rect) {
Widget::resize(self, area); // Widget::set_area(self, area);
self.set_area(area);
} }
fn update(&mut self, area: Rect) -> anyhow::Result<()> { fn update(&mut self, area: Rect) -> anyhow::Result<()> {
@ -98,9 +100,9 @@ impl<C> BoxedWidget<C> {
self.widget.size(max_width, max_height) self.widget.size(max_width, max_height)
} }
pub fn resize(&mut self, area: Rect) { pub fn set_area(&mut self, area: Rect) {
self.area = area; self.area = area;
self.widget.resize(area); self.widget.set_area(area);
} }
pub fn update(&mut self) -> anyhow::Result<()> { pub fn update(&mut self) -> anyhow::Result<()> {

4
showbits-common/src/widgets/background.rs
View file

@ -16,8 +16,8 @@ impl<C: Color> Widget<C> for Background<C> {
self.inner.size(max_width, max_height) self.inner.size(max_width, max_height)
} }
fn resize(&mut self, area: crate::Rect) { fn set_area(&mut self, area: crate::Rect) {
self.inner.resize(area); self.inner.set_area(area);
} }
fn update(&mut self, _area: crate::Rect) -> anyhow::Result<()> { fn update(&mut self, _area: crate::Rect) -> anyhow::Result<()> {