From be51cac3d71d5eb49e266d0d2aae6ab945caf560 Mon Sep 17 00:00:00 2001 From: Cory Forsstrom Date: Tue, 14 Sep 2021 09:10:37 -0700 Subject: Add Align::Fill variant --- web/src/css.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'web/src/css.rs') diff --git a/web/src/css.rs b/web/src/css.rs index 21f51f85..23b21e22 100644 --- a/web/src/css.rs +++ b/web/src/css.rs @@ -201,6 +201,7 @@ pub fn align(align: Align) -> &'static str { Align::Start => "flex-start", Align::Center => "center", Align::End => "flex-end", + Align::Fill => "stretch", } } -- cgit From 5fae6e59ffbc5913761df638dc7f0c35b7f43bc9 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 20 Sep 2021 14:33:02 +0700 Subject: Introduce and use `CrossAlign` enum for `Column` and `Row` --- web/src/css.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'web/src/css.rs') diff --git a/web/src/css.rs b/web/src/css.rs index 23b21e22..c132d045 100644 --- a/web/src/css.rs +++ b/web/src/css.rs @@ -1,5 +1,5 @@ //! Style your widgets. -use crate::{bumpalo, Align, Background, Color, Length, Padding}; +use crate::{bumpalo, Align, Background, Color, CrossAlign, Length, Padding}; use std::collections::BTreeMap; @@ -201,7 +201,16 @@ pub fn align(align: Align) -> &'static str { Align::Start => "flex-start", Align::Center => "center", Align::End => "flex-end", - Align::Fill => "stretch", + } +} + +/// Returns the style value for the given [`CrossAlign`]. +pub fn cross_align(align: CrossAlign) -> &'static str { + match align { + CrossAlign::Start => "flex-start", + CrossAlign::Center => "center", + CrossAlign::End => "flex-end", + CrossAlign::Fill => "stretch", } } -- cgit From a0ad3996225601aaa1ebe051cba115374b55c80e Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 20 Sep 2021 15:09:55 +0700 Subject: Refactor alignment types into an `alignment` module --- web/src/css.rs | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'web/src/css.rs') diff --git a/web/src/css.rs b/web/src/css.rs index c132d045..07589150 100644 --- a/web/src/css.rs +++ b/web/src/css.rs @@ -1,5 +1,6 @@ //! Style your widgets. -use crate::{bumpalo, Align, Background, Color, CrossAlign, Length, Padding}; +use crate::bumpalo; +use crate::{Alignment, Background, Color, Length, Padding}; use std::collections::BTreeMap; @@ -195,22 +196,13 @@ pub fn background(background: Background) -> String { } } -/// Returns the style value for the given [`Align`]. -pub fn align(align: Align) -> &'static str { - match align { - Align::Start => "flex-start", - Align::Center => "center", - Align::End => "flex-end", - } -} - -/// Returns the style value for the given [`CrossAlign`]. -pub fn cross_align(align: CrossAlign) -> &'static str { - match align { - CrossAlign::Start => "flex-start", - CrossAlign::Center => "center", - CrossAlign::End => "flex-end", - CrossAlign::Fill => "stretch", +/// Returns the style value for the given [`Alignment`]. +pub fn alignment(alignment: Alignment) -> &'static str { + match alignment { + Alignment::Start => "flex-start", + Alignment::Center => "center", + Alignment::End => "flex-end", + Alignment::Fill => "stretch", } } -- cgit