Make style control easier

Author: 38

src/style/color.rs

@@ -61,7 +61,7 @@ impl<T: Color> Color for &'_ T {
 
 /// The RGBA representation of the color, Plotters use RGBA as the internal representation
 /// of color
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, PartialEq, Debug, Default)]
 pub struct RGBAColor(pub(crate) u8, pub(crate) u8, pub(crate) u8, pub(crate) f64);
 
 impl Color for RGBAColor {
@@ -95,7 +95,7 @@ impl<P: Palette> Color for PaletteColor<P> {
 }
 
 /// The color described by its RGB value
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug, Default)]
 pub struct RGBColor(pub u8, pub u8, pub u8);
 
 impl BackendStyle for RGBAColor {

src/style/font/font_desc.rs

@@ -24,13 +24,13 @@ pub struct FontDesc<'a> {
 
 impl<'a> From<&'a str> for FontDesc<'a> {
     fn from(from: &'a str) -> FontDesc<'a> {
-        FontDesc::new(from.into(), 1.0, FontStyle::Normal)
+        FontDesc::new(from.into(), 12.0, FontStyle::Normal)
     }
 }
 
 impl<'a> From<FontFamily<'a>> for FontDesc<'a> {
     fn from(family: FontFamily<'a>) -> FontDesc<'a> {
-        FontDesc::new(family, 1.0, FontStyle::Normal)
+        FontDesc::new(family, 12.0, FontStyle::Normal)
     }
 }
 
@@ -40,6 +40,18 @@ impl<'a, T: Into<f64>> From<(FontFamily<'a>, T)> for FontDesc<'a> {
     }
 }
 
+impl From<f64> for FontDesc<'static> {
+    fn from(size: f64) -> FontDesc<'static> {
+        FontDesc::new(FontFamily::SansSerif, size.into(), FontStyle::Normal)
+    }
+}
+
+impl From<u32> for FontDesc<'static> {
+    fn from(size: u32) -> FontDesc<'static> {
+        FontDesc::new(FontFamily::SansSerif, size.into(), FontStyle::Normal)
+    }
+}
+
 impl<'a, T: Into<f64>> From<(&'a str, T)> for FontDesc<'a> {
     fn from((typeface, size): (&'a str, T)) -> FontDesc<'a> {
         FontDesc::new(typeface.into(), size.into(), FontStyle::Normal)
@@ -91,7 +103,7 @@ impl<'a> FontDesc<'a> {
     ///
     /// - `size`: The new size to set
     /// - **returns** The newly created font descriptor with a new size
-    pub fn resize(&self, size: f64) -> FontDesc<'a> {
+    pub fn resize(&self, size: f64) -> Self {
         Self {
             size,
             family: self.family,

src/style/font/ttf.rs

@@ -302,7 +302,6 @@ mod test {
 
     #[test]
     fn test_font_cache() -> FontResult<()> {
-
         // We cannot only check the size of font cache, because
         // the test case may be run in parallel. Thus the font cache
         // may contains other fonts.

src/style/text.rs

@@ -38,18 +38,36 @@ impl<'a> IntoTextStyle<'a> for FontFamily<'a> {
     }
 }
 
+impl<'a, T: Color> IntoTextStyle<'a> for &'a T {
+    fn into_text_style<P: HasDimension>(self, _: &P) -> TextStyle<'a> {
+        Into::<TextStyle>::into(FontFamily::SansSerif).color(self)
+    }
+}
+
 impl<'a, T: SizeDesc> IntoTextStyle<'a> for (&'a str, T) {
     fn into_text_style<P: HasDimension>(self, parent: &P) -> TextStyle<'a> {
         (self.0, self.1.in_pixels(parent)).into()
     }
 }
 
+impl<'a, T: SizeDesc, C: Color> IntoTextStyle<'a> for (&'a str, T, &'a C) {
+    fn into_text_style<P: HasDimension>(self, parent: &P) -> TextStyle<'a> {
+        Into::<TextStyle>::into((self.0, self.1.in_pixels(parent))).color(self.2)
+    }
+}
+
 impl<'a, T: SizeDesc> IntoTextStyle<'a> for (FontFamily<'a>, T) {
     fn into_text_style<P: HasDimension>(self, parent: &P) -> TextStyle<'a> {
         (self.0, self.1.in_pixels(parent)).into()
     }
 }
 
+impl<'a, T: SizeDesc, C: Color> IntoTextStyle<'a> for (FontFamily<'a>, T, &'a C) {
+    fn into_text_style<P: HasDimension>(self, parent: &P) -> TextStyle<'a> {
+        Into::<TextStyle>::into((self.0, self.1.in_pixels(parent))).color(self.2)
+    }
+}
+
 impl<'a, T: SizeDesc> IntoTextStyle<'a> for (&'a str, T, FontStyle) {
     fn into_text_style<P: HasDimension>(self, parent: &P) -> TextStyle<'a> {
         Into::<FontDesc>::into((self.0, self.1.in_pixels(parent), self.2)).into()