swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: use taffy dimension directly

Browse Source
This commit is contained in:
Jonathan Kelley committed 2022-07-15 22:17:00 -04:00
1 parent 2369b0cc7f
commit 62b9a0593f
3 files changed
+59 -87
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/native-core/README.md
+1
View File
@@ -0,0 +1 @@
# Dioxus Native-Core: An ECS approach to GUI state and trees
packages/native-core/src/layout_attributes.rs
+57 -87
View File
@@ -126,14 +126,18 @@ pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) {
| "flex-shrink" | "flex-shrink"
| "flex-wrap" => apply_flex(name, value, style), | "flex-wrap" => apply_flex(name, value, style),
"float" => {} "float" => {},
"font-style"
| "font-variant"
| "font-weight"
| "font-size"
| "line-height"
| "font-family" => apply_font(name, value, style),
"height" => { "height" => {
if let Some(v) = parse_value(value){ if let Some(v) = parse_value(value){
style.size.height = match v { style.size.height = v;
UnitSystem::Percent(v)=> Dimension::Percent(v/100.0),
UnitSystem::Point(v)=> Dimension::Points(v),
};
} }
} }
"justify-content" => { "justify-content" => {
@@ -150,7 +154,6 @@ pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) {
} }
"left" => {} "left" => {}
"letter-spacing" => {} "letter-spacing" => {}
"line-height" => {}
"list-style" "list-style"
| "list-style-image" | "list-style-image"
@@ -231,10 +234,7 @@ pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) {
"white-space" => {} "white-space" => {}
"width" => { "width" => {
if let Some(v) = parse_value(value){ if let Some(v) = parse_value(value){
style.size.width = match v { style.size.width = v;
UnitSystem::Percent(v)=> Dimension::Percent(v/100.0),
UnitSystem::Point(v)=> Dimension::Points(v),
};
} }
} }
"word-break" => {} "word-break" => {}
@@ -245,33 +245,34 @@ pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) {
} }
} }
/// a relative or absolute size fn apply_font(name: &str, value: &str, style: &mut Style) {
#[derive(Clone, Copy, PartialEq, Debug)] match name {
pub enum UnitSystem { "font-style" => {}
Percent(f32), "font-variant" => {}
Point(f32), "font-weight" => {}
} "font-size" => {}
"line-height" => {
impl From<UnitSystem> for Dimension { style.size = Size {
fn from(other: UnitSystem) -> Dimension { width: style.size.width,
match other { height: parse_value(value).unwrap_or(Dimension::Points(12.0)),
UnitSystem::Percent(v) => Dimension::Percent(v), }
UnitSystem::Point(v) => Dimension::Points(v),
} }
"font-family" => {}
_ => {}
} }
} }
/// parse relative or absolute value /// parse relative or absolute value
pub fn parse_value(value: &str) -> Option<UnitSystem> { pub fn parse_value(value: &str) -> Option<Dimension> {
if value.ends_with("px") { if value.ends_with("px") {
if let Ok(px) = value.trim_end_matches("px").parse::<f32>() { if let Ok(px) = value.trim_end_matches("px").parse::<f32>() {
Some(UnitSystem::Point(px)) Some(Dimension::Points(px))
} else { } else {
None None
} }
} else if value.ends_with('%') { } else if value.ends_with('%') {
if let Ok(pct) = value.trim_end_matches('%').parse::<f32>() { if let Ok(pct) = value.trim_end_matches('%').parse::<f32>() {
Some(UnitSystem::Percent(pct)) Some(Dimension::Percent(pct / 100.0))
} else { } else {
None None
} }
@@ -328,7 +329,7 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
} }
"border-bottom-width" => { "border-bottom-width" => {
if let Some(v) = parse_value(value) { if let Some(v) = parse_value(value) {
style.border.bottom = v.into(); style.border.bottom = v;
} }
} }
"border-collapse" => {} "border-collapse" => {}
@@ -349,7 +350,7 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
} }
"border-left-width" => { "border-left-width" => {
if let Some(v) = parse_value(value) { if let Some(v) = parse_value(value) {
style.border.start = v.into(); style.border.start = v;
} }
} }
"border-radius" => {} "border-radius" => {}
@@ -361,7 +362,7 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
} }
"border-right-width" => { "border-right-width" => {
if let Some(v) = parse_value(value) { if let Some(v) = parse_value(value) {
style.border.end = v.into(); style.border.end = v;
} }
} }
"border-spacing" => {} "border-spacing" => {}
@@ -395,17 +396,19 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
} }
"border-top-width" => { "border-top-width" => {
if let Some(v) = parse_value(value) { if let Some(v) = parse_value(value) {
style.border.top = v.into(); style.border.top = v;
} }
} }
"border-width" => { "border-width" => {
let values: Vec<_> = value.split(' ').collect(); let values: Vec<_> = value.split(' ').collect();
if values.len() == 1 { if values.len() == 1 {
if let Some(w) = parse_value(values[0]) { if let Some(dim) = parse_value(values[0]) {
style.border.top = w.into(); style.border = Rect {
style.border.bottom = w.into(); start: dim,
style.border.start = w.into(); end: dim,
style.border.end = w.into(); top: dim,
bottom: dim,
};
} }
} else { } else {
let border_widths = [ let border_widths = [
@@ -416,7 +419,7 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
]; ];
for (v, width) in values.into_iter().zip(border_widths) { for (v, width) in values.into_iter().zip(border_widths) {
if let Some(w) = parse_value(v) { if let Some(w) = parse_value(v) {
*width = w.into(); *width = w;
} }
} }
} }
@@ -476,10 +479,7 @@ fn apply_flex(name: &str, value: &str, style: &mut Style) {
} }
"flex-basis" => { "flex-basis" => {
if let Some(v) = parse_value(value) { if let Some(v) = parse_value(value) {
style.flex_basis = match v { style.flex_basis = v;
UnitSystem::Percent(v) => Dimension::Percent(v / 100.0),
UnitSystem::Point(v) => Dimension::Points(v),
};
} }
} }
"flex-flow" => {} "flex-flow" => {}
@@ -507,35 +507,20 @@ fn apply_flex(name: &str, value: &str, style: &mut Style) {
} }
fn apply_padding(name: &str, value: &str, style: &mut Style) { fn apply_padding(name: &str, value: &str, style: &mut Style) {
match parse_value(value) { if let Some(v) = parse_value(value) {
Some(UnitSystem::Percent(v)) => match name { match name {
"padding" => { "padding" => {
let v = Dimension::Percent(v / 100.0);
style.padding.top = v; style.padding.top = v;
style.padding.bottom = v; style.padding.bottom = v;
style.padding.start = v; style.padding.start = v;
style.padding.end = v; style.padding.end = v;
} }
"padding-bottom" => style.padding.bottom = Dimension::Percent(v / 100.0), "padding-bottom" => style.padding.bottom = v,
"padding-left" => style.padding.start = Dimension::Percent(v / 100.0), "padding-left" => style.padding.start = v,
"padding-right" => style.padding.end = Dimension::Percent(v / 100.0), "padding-right" => style.padding.end = v,
"padding-top" => style.padding.top = Dimension::Percent(v / 100.0), "padding-top" => style.padding.top = v,
_ => {} _ => {}
}, }
Some(UnitSystem::Point(v)) => match name {
"padding" => {
style.padding.top = Dimension::Points(v);
style.padding.bottom = Dimension::Points(v);
style.padding.start = Dimension::Points(v);
style.padding.end = Dimension::Points(v);
}
"padding-bottom" => style.padding.bottom = Dimension::Points(v),
"padding-left" => style.padding.start = Dimension::Points(v),
"padding-right" => style.padding.end = Dimension::Points(v),
"padding-top" => style.padding.top = Dimension::Points(v),
_ => {}
},
None => {}
} }
} }
@@ -588,34 +573,19 @@ fn apply_align(name: &str, value: &str, style: &mut Style) {
} }
fn apply_margin(name: &str, value: &str, style: &mut Style) { fn apply_margin(name: &str, value: &str, style: &mut Style) {
match parse_value(value) { if let Some(dim) = parse_value(value) {
Some(UnitSystem::Percent(v)) => match name { match name {
"margin" => { "margin" => {
let v = Dimension::Percent(v / 100.0); style.margin.top = dim;
style.margin.top = v; style.margin.bottom = dim;
style.margin.bottom = v; style.margin.start = dim;
style.margin.start = v; style.margin.end = dim;
style.margin.end = v;
} }
"margin-top" => style.margin.top = Dimension::Percent(v / 100.0), "margin-top" => style.margin.top = dim,
"margin-bottom" => style.margin.bottom = Dimension::Percent(v / 100.0), "margin-bottom" => style.margin.bottom = dim,
"margin-left" => style.margin.start = Dimension::Percent(v / 100.0), "margin-left" => style.margin.start = dim,
"margin-right" => style.margin.end = Dimension::Percent(v / 100.0), "margin-right" => style.margin.end = dim,
_ => {} _ => {}
}, }
Some(UnitSystem::Point(v)) => match name {
"margin" => {
style.margin.top = Dimension::Points(v);
style.margin.bottom = Dimension::Points(v);
style.margin.start = Dimension::Points(v);
style.margin.end = Dimension::Points(v);
}
"margin-top" => style.margin.top = Dimension::Points(v),
"margin-bottom" => style.margin.bottom = Dimension::Points(v),
"margin-left" => style.margin.start = Dimension::Points(v),
"margin-right" => style.margin.end = Dimension::Points(v),
_ => {}
},
None => {}
} }
} }
packages/native-core/src/node_ref.rs
+1
View File
@@ -7,6 +7,7 @@ pub struct NodeView<'a> {
inner: &'a VNode<'a>, inner: &'a VNode<'a>,
mask: NodeMask, mask: NodeMask,
} }
impl<'a> NodeView<'a> { impl<'a> NodeView<'a> {
pub fn new(mut vnode: &'a VNode<'a>, view: NodeMask, vdom: &'a VirtualDom) -> Self { pub fn new(mut vnode: &'a VNode<'a>, view: NodeMask, vdom: &'a VirtualDom) -> Self {
if let VNode::Component(sc) = vnode { if let VNode::Component(sc) = vnode {