feat: Devtools fixes and improvements

marc2332 · Nov 3, 2023 · c487a8b · c487a8b
1 parent f3813c1
commit c487a8b
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 7 deletions.
diff --git a/crates/core/src/node.rs b/crates/core/src/node.rs
@@ -3,7 +3,7 @@ use freya_dom::prelude::DioxusNode;
 use freya_engine::prelude::*;
 use freya_node_state::{
     Border, CornerRadius, CursorSettings, Fill, FontStyleState, LayoutState, References, Shadow,
-    Style, Transform,
+    Style, TextOverflow, Transform,
 };
 use torin::{alignment::Alignment, direction::DirectionMode, gaps::Gaps, size::Size};
 
@@ -114,20 +114,28 @@ impl<'a> Iterator for NodeStateIterator<'a> {
                 "line_height",
                 AttributeType::Measure(self.state.font_style.line_height),
             )),
-            17 => Some(("offset_x", AttributeType::Measure(self.state.size.offset_x))),
-            18 => Some(("offset_y", AttributeType::Measure(self.state.size.offset_y))),
+            17 => Some((
+                "text_align",
+                AttributeType::TextAlignment(&self.state.font_style.text_align),
+            )),
+            18 => Some((
+                "text_overflow",
+                AttributeType::TextOverflow(&self.state.font_style.text_overflow),
+            )),
+            19 => Some(("offset_x", AttributeType::Measure(self.state.size.offset_x))),
+            20 => Some(("offset_y", AttributeType::Measure(self.state.size.offset_y))),
             n => {
                 let shadows = &self.state.style.shadows;
                 let shadow = shadows
-                    .get(n - 19)
+                    .get(n - 21)
                     .map(|shadow| ("shadow", AttributeType::Shadow(shadow)));
 
                 if shadow.is_some() {
                     shadow
                 } else {
                     let text_shadows = &self.state.font_style.text_shadows;
                     text_shadows
-                        .get(n - 19 + shadows.len())
+                        .get(n - 21 + shadows.len())
                         .map(|text_shadow| ("text_shadow", AttributeType::TextShadow(text_shadow)))
                 }
             }
@@ -155,4 +163,23 @@ pub enum AttributeType<'a> {
     TextShadow(&'a TextShadow),
     Text(String),
     Border(&'a Border),
+    TextAlignment(&'a TextAlign),
+    TextOverflow(&'a TextOverflow),
+}
+
+pub trait ExternalPretty {
+    fn pretty(&self) -> String;
+}
+
+impl ExternalPretty for TextAlign {
+    fn pretty(&self) -> String {
+        match self {
+            TextAlign::Left => "left".to_string(),
+            TextAlign::Right => "right".to_string(),
+            TextAlign::Center => "center".to_string(),
+            TextAlign::Justify => "justify".to_string(),
+            TextAlign::Start => "start".to_string(),
+            TextAlign::End => "end".to_string(),
+        }
+    }
 }
diff --git a/crates/devtools/src/tabs/style.rs b/crates/devtools/src/tabs/style.rs
@@ -141,6 +141,24 @@ pub fn NodeInspectorStyle(cx: Scope, node_id: NodeId) -> Element {
                                     }
                                 }
                             }
+                            AttributeType::TextAlignment(text_align) => {
+                                rsx!{
+                                    Property {
+                                        key: "{i}",
+                                        name: "{name}",
+                                        value: text_align.pretty()
+                                    }
+                                }
+                            }
+                            AttributeType::TextOverflow(text_overflow) => {
+                                rsx!{
+                                    Property {
+                                        key: "{i}",
+                                        name: "{name}",
+                                        value: text_overflow.pretty()
+                                    }
+                                }
+                            }
                         }
                     })
                 }

diff --git a/crates/state/src/values/font.rs b/crates/state/src/values/font.rs
@@ -114,6 +114,14 @@ impl TextOverflow {
             Self::Custom(custom) => Some(custom),
         }
     }
+
+    pub fn pretty(&self) -> String {
+        match self {
+            TextOverflow::Clip => "clip".to_string(),
+            TextOverflow::Ellipsis => "ellipsis".to_string(),
+            TextOverflow::Custom(text_overflow) => text_overflow.to_string(),
+        }
+    }
 }
 
 #[derive(Debug, PartialEq, Eq)]

diff --git a/crates/torin/src/values/alignment.rs b/crates/torin/src/values/alignment.rs
@@ -12,6 +12,10 @@ impl Alignment {
     }
 
     pub fn pretty(&self) -> String {
-        format!("{self:?}")
+        match self {
+            Alignment::Start => "start".to_string(),
+            Alignment::Center => "center".to_string(),
+            Alignment::End => "end".to_string(),
+        }
     }
 }
diff --git a/crates/torin/src/values/size.rs b/crates/torin/src/values/size.rs
@@ -20,7 +20,7 @@ impl Default for Size {
 impl Size {
     pub fn pretty(&self) -> String {
         match self {
-            Size::Inner => "inner".to_string(),
+            Size::Inner => "auto".to_string(),
             Size::Pixels(s) => format!("{}", s.get()),
             Size::DynamicCalculations(calcs) => format!(
                 "calc({})",