update tui to use taffy dimention directly (#501)

This commit is contained in:
Demonthos authored and GitHub committed 2022-07-19 09:27:19 -07:00
1 parent d090b24f8d
commit 39cbc82107
2 files changed
+10 -9

No files matched your search

+4 -4
View File
@@ -1,8 +1,7 @@
use dioxus_native_core::layout_attributes::UnitSystem;
use std::io::Stdout; use std::io::Stdout;
use taffy::{ use taffy::{
geometry::Point, geometry::Point,
prelude::{Layout, Size}, prelude::{Dimension, Layout, Size},
Taffy, Taffy,
}; };
use tui::{backend::CrosstermBackend, layout::Rect, style::Color}; use tui::{backend::CrosstermBackend, layout::Rect, style::Color};
@@ -252,8 +251,9 @@ impl RinkWidget for &Node {
BorderStyle::Hidden => 0.0, BorderStyle::Hidden => 0.0,
BorderStyle::None => 0.0, BorderStyle::None => 0.0,
_ => match border.radius { _ => match border.radius {
UnitSystem::Percent(p) => p * area.width as f32 / 100.0, Dimension::Percent(p) => p * area.width as f32 / 100.0,
UnitSystem::Point(p) => p, Dimension::Points(p) => p,
_ => todo!(),
} }
.abs() .abs()
.min((area.width as f32 / RADIUS_MULTIPLIER[0]) / 2.0) .min((area.width as f32 / RADIUS_MULTIPLIER[0]) / 2.0)
+6 -5
View File
@@ -31,11 +31,12 @@
use dioxus_core::Attribute; use dioxus_core::Attribute;
use dioxus_native_core::{ use dioxus_native_core::{
layout_attributes::{parse_value, UnitSystem}, layout_attributes::parse_value,
node_ref::{AttributeMask, NodeMask, NodeView}, node_ref::{AttributeMask, NodeMask, NodeView},
state::ParentDepState, state::ParentDepState,
}; };
use dioxus_native_core_macro::sorted_str_slice; use dioxus_native_core_macro::sorted_str_slice;
use taffy::prelude::*;
use crate::style::{RinkColor, RinkStyle}; use crate::style::{RinkColor, RinkStyle};
@@ -127,8 +128,8 @@ impl Borders {
pub struct BorderEdge { pub struct BorderEdge {
pub color: Option<RinkColor>, pub color: Option<RinkColor>,
pub style: BorderStyle, pub style: BorderStyle,
pub width: UnitSystem, pub width: Dimension,
pub radius: UnitSystem, pub radius: Dimension,
} }
impl Default for BorderEdge { impl Default for BorderEdge {
@@ -136,8 +137,8 @@ impl Default for BorderEdge {
Self { Self {
color: None, color: None,
style: BorderStyle::None, style: BorderStyle::None,
width: UnitSystem::Point(0.0), width: Dimension::Points(0.0),
radius: UnitSystem::Point(0.0), radius: Dimension::Points(0.0),
} }
} }
} }