Move TextStyle into styled_text

Author: waywardmonkeys

parley/src/style/mod.rs

@@ -5,10 +5,9 @@
 
 mod styleset;
 
-use alloc::borrow::Cow;
 pub use styled_text::{
     Brush, FontFamily, FontSettings, FontStack, GenericFamily, Stretch as FontStretch,
-    Style as FontStyle, StyleProperty, Weight as FontWeight,
+    Style as FontStyle, StyleProperty, TextStyle, Weight as FontWeight,
 };
 
 pub use styleset::StyleSet;
@@ -24,75 +23,3 @@ pub enum WhiteSpaceCollapse {
     Collapse,
     Preserve,
 }
-
-/// Unresolved styles.
-#[derive(Clone, PartialEq, Debug)]
-pub struct TextStyle<'a, B: Brush> {
-    /// Font family stack.
-    pub font_stack: FontStack<'a>,
-    /// Font size.
-    pub font_size: f32,
-    /// Font stretch.
-    pub font_stretch: FontStretch,
-    /// Font style.
-    pub font_style: FontStyle,
-    /// Font weight.
-    pub font_weight: FontWeight,
-    /// Font variation settings.
-    pub font_variations: FontSettings<'a, styled_text::FontVariation>,
-    /// Font feature settings.
-    pub font_features: FontSettings<'a, styled_text::FontFeature>,
-    /// Locale.
-    pub locale: Option<&'a str>,
-    /// Brush for rendering text.
-    pub brush: B,
-    /// Underline decoration.
-    pub has_underline: bool,
-    /// Offset of the underline decoration.
-    pub underline_offset: Option<f32>,
-    /// Size of the underline decoration.
-    pub underline_size: Option<f32>,
-    /// Brush for rendering the underline decoration.
-    pub underline_brush: Option<B>,
-    /// Strikethrough decoration.
-    pub has_strikethrough: bool,
-    /// Offset of the strikethrough decoration.
-    pub strikethrough_offset: Option<f32>,
-    /// Size of the strikethrough decoration.
-    pub strikethrough_size: Option<f32>,
-    /// Brush for rendering the strikethrough decoration.
-    pub strikethrough_brush: Option<B>,
-    /// Line height multiplier.
-    pub line_height: f32,
-    /// Extra spacing between words.
-    pub word_spacing: f32,
-    /// Extra spacing between letters.
-    pub letter_spacing: f32,
-}
-
-impl<B: Brush> Default for TextStyle<'_, B> {
-    fn default() -> Self {
-        TextStyle {
-            font_stack: FontStack::Source(Cow::Borrowed("sans-serif")),
-            font_size: 16.0,
-            font_stretch: Default::default(),
-            font_style: Default::default(),
-            font_weight: Default::default(),
-            font_variations: FontSettings::List(Cow::Borrowed(&[])),
-            font_features: FontSettings::List(Cow::Borrowed(&[])),
-            locale: Default::default(),
-            brush: Default::default(),
-            has_underline: Default::default(),
-            underline_offset: Default::default(),
-            underline_size: Default::default(),
-            underline_brush: Default::default(),
-            has_strikethrough: Default::default(),
-            strikethrough_offset: Default::default(),
-            strikethrough_size: Default::default(),
-            strikethrough_brush: Default::default(),
-            line_height: 1.2,
-            word_spacing: Default::default(),
-            letter_spacing: Default::default(),
-        }
-    }
-}

styled_text/src/lib.rs

@@ -27,8 +27,10 @@ mod font_family;
 mod font_settings;
 mod font_stack;
 mod generic_family;
-pub mod setting;
 mod style_property;
+mod text_style;
+
+pub mod setting;
 
 pub use attributes::{Stretch, Style, Weight};
 pub use brush::Brush;
@@ -37,3 +39,4 @@ pub use font_settings::{FontFeature, FontSettings, FontVariation};
 pub use font_stack::FontStack;
 pub use generic_family::GenericFamily;
 pub use style_property::StyleProperty;
+pub use text_style::TextStyle;

styled_text/src/text_style.rs

@@ -0,0 +1,78 @@
+// Copyright 2021 the Parley Authors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+use alloc::borrow::Cow;
+
+use crate::{Brush, FontFeature, FontSettings, FontStack, FontVariation, Stretch, Style, Weight};
+
+/// Unresolved styles.
+#[derive(Clone, PartialEq, Debug)]
+pub struct TextStyle<'a, B: Brush> {
+    /// Font family stack.
+    pub font_stack: FontStack<'a>,
+    /// Font size.
+    pub font_size: f32,
+    /// Font stretch.
+    pub font_stretch: Stretch,
+    /// Font style.
+    pub font_style: Style,
+    /// Font weight.
+    pub font_weight: Weight,
+    /// Font variation settings.
+    pub font_variations: FontSettings<'a, FontVariation>,
+    /// Font feature settings.
+    pub font_features: FontSettings<'a, FontFeature>,
+    /// Locale.
+    pub locale: Option<&'a str>,
+    /// Brush for rendering text.
+    pub brush: B,
+    /// Underline decoration.
+    pub has_underline: bool,
+    /// Offset of the underline decoration.
+    pub underline_offset: Option<f32>,
+    /// Size of the underline decoration.
+    pub underline_size: Option<f32>,
+    /// Brush for rendering the underline decoration.
+    pub underline_brush: Option<B>,
+    /// Strikethrough decoration.
+    pub has_strikethrough: bool,
+    /// Offset of the strikethrough decoration.
+    pub strikethrough_offset: Option<f32>,
+    /// Size of the strikethrough decoration.
+    pub strikethrough_size: Option<f32>,
+    /// Brush for rendering the strikethrough decoration.
+    pub strikethrough_brush: Option<B>,
+    /// Line height multiplier.
+    pub line_height: f32,
+    /// Extra spacing between words.
+    pub word_spacing: f32,
+    /// Extra spacing between letters.
+    pub letter_spacing: f32,
+}
+
+impl<B: Brush> Default for TextStyle<'_, B> {
+    fn default() -> Self {
+        TextStyle {
+            font_stack: FontStack::Source(Cow::Borrowed("sans-serif")),
+            font_size: 16.0,
+            font_stretch: Default::default(),
+            font_style: Default::default(),
+            font_weight: Default::default(),
+            font_variations: FontSettings::List(Cow::Borrowed(&[])),
+            font_features: FontSettings::List(Cow::Borrowed(&[])),
+            locale: Default::default(),
+            brush: Default::default(),
+            has_underline: Default::default(),
+            underline_offset: Default::default(),
+            underline_size: Default::default(),
+            underline_brush: Default::default(),
+            has_strikethrough: Default::default(),
+            strikethrough_offset: Default::default(),
+            strikethrough_size: Default::default(),
+            strikethrough_brush: Default::default(),
+            line_height: 1.2,
+            word_spacing: Default::default(),
+            letter_spacing: Default::default(),
+        }
+    }
+}