nuon: Text color (#280)

Author: PolyMeilex

neothesia/src/scene/mod.rs

@@ -3,6 +3,7 @@ pub mod playing_scene;
 
 use crate::context::Context;
 use iced_core::image::Renderer as _;
+use iced_graphics::text::cosmic_text;
 use midi_file::midly::MidiMessage;
 use neothesia_core::render::{QuadRenderer, TextRenderer};
 use std::time::Duration;
@@ -92,9 +93,22 @@ fn render_nuon(ui: &mut nuon::Ui, nuon_renderer: &mut NuonRenderer, ctx: &mut Co
 
         for text in layer.text.iter() {
             let buffer = if text.bold {
-                TextRenderer::gen_buffer_bold(text.size, &text.text)
+                TextRenderer::gen_buffer_with_attr(
+                    text.size,
+                    &text.text,
+                    cosmic_text::Attrs::new()
+                        .family(cosmic_text::Family::Name("Roboto"))
+                        .weight(cosmic_text::Weight::BOLD)
+                        .color(cosmic_text::Color(text.color.packet_u32())),
+                )
             } else {
-                TextRenderer::gen_buffer(text.size, &text.text)
+                TextRenderer::gen_buffer_with_attr(
+                    text.size,
+                    &text.text,
+                    cosmic_text::Attrs::new()
+                        .family(cosmic_text::Family::Name("Roboto"))
+                        .color(cosmic_text::Color(text.color.packet_u32())),
+                )
             };
 
             match text.text_justify {

nuon/src/lib.rs

@@ -53,6 +53,14 @@ impl Color {
             a,
         }
     }
+
+    pub fn packet_u32(&self) -> u32 {
+        let r = self.r * 255.0;
+        let g = self.g * 255.0;
+        let b = self.b * 255.0;
+        let a = self.a * 255.0;
+        ((a as u32) << 24) | ((r as u32) << 16) | ((g as u32) << 8) | (b as u32)
+    }
 }
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
@@ -184,6 +192,7 @@ pub struct TextRenderElement {
     pub size: f32,
     pub bold: bool,
     pub text: String,
+    pub color: Color,
 }
 
 #[derive(Debug, Clone)]
@@ -869,6 +878,8 @@ pub struct Label {
     pos: Point,
     size: Size,
     font_size: f32,
+    text_justify: TextJustify,
+    color: Color,
     text: String,
     icon: String,
     bold: bool,
@@ -890,6 +901,8 @@ impl Label {
             pos: Point::zero(),
             size: Size::new(50.0, 50.0),
             font_size: 13.0,
+            text_justify: TextJustify::Center,
+            color: Color::new(1.0, 1.0, 1.0, 1.0),
             text: String::new(),
             icon: String::new(),
             bold: false,
@@ -929,6 +942,16 @@ impl Label {
         self
     }
 
+    pub fn color(mut self, color: impl Into<Color>) -> Self {
+        self.color = color.into();
+        self
+    }
+
+    pub fn text_justify(mut self, text_justify: TextJustify) -> Self {
+        self.text_justify = text_justify;
+        self
+    }
+
     pub fn text(mut self, text: impl Into<String>) -> Self {
         self.text = text.into();
         self
@@ -951,10 +974,11 @@ impl Label {
         if !self.text.is_empty() {
             layer.text.push(TextRenderElement {
                 rect,
-                text_justify: TextJustify::Center,
+                text_justify: self.text_justify,
                 size: self.font_size,
                 bold: self.bold,
                 text: self.text.to_string(),
+                color: self.color,
             });
         }