summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--wgpu/src/renderer.rs76
-rw-r--r--wgpu/src/renderer/button.rs45
-rw-r--r--wgpu/src/renderer/checkbox.rs2
-rw-r--r--wgpu/src/renderer/image.rs2
-rw-r--r--wgpu/src/renderer/radio.rs2
-rw-r--r--wgpu/src/renderer/text.rs5
6 files changed, 99 insertions, 33 deletions
diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index 9883943b..ae5692e3 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -1,5 +1,7 @@
-use crate::{quad, Background, Primitive, Quad, Transformation};
-use iced_native::{renderer::Debugger, Color, Layout, Point, Widget};
+use crate::{quad, Primitive, Quad, Transformation};
+use iced_native::{
+ renderer::Debugger, Background, Color, Layout, Point, Widget,
+};
use raw_window_handle::HasRawWindowHandle;
use wgpu::{
@@ -159,20 +161,74 @@ impl Renderer {
content,
bounds,
size,
- } => self.glyph_brush.borrow_mut().queue(Section {
- text: &content,
- screen_position: (bounds.x, bounds.y),
- bounds: (bounds.width, bounds.height),
- scale: wgpu_glyph::Scale { x: *size, y: *size },
- ..Default::default()
- }),
- Primitive::Quad { bounds, background } => {
+ color,
+ horizontal_alignment,
+ vertical_alignment,
+ } => {
+ let x = match horizontal_alignment {
+ iced_native::text::HorizontalAlignment::Left => bounds.x,
+ iced_native::text::HorizontalAlignment::Center => {
+ bounds.x + bounds.width / 2.0
+ }
+ iced_native::text::HorizontalAlignment::Right => {
+ bounds.x + bounds.width
+ }
+ };
+
+ let y = match vertical_alignment {
+ iced_native::text::VerticalAlignment::Top => bounds.y,
+ iced_native::text::VerticalAlignment::Center => {
+ bounds.y + bounds.height / 2.0
+ }
+ iced_native::text::VerticalAlignment::Bottom => {
+ bounds.y + bounds.height
+ }
+ };
+
+ self.glyph_brush.borrow_mut().queue(Section {
+ text: &content,
+ screen_position: (x, y),
+ bounds: (bounds.width, bounds.height),
+ scale: wgpu_glyph::Scale { x: *size, y: *size },
+ color: color.into_linear(),
+ layout: wgpu_glyph::Layout::default()
+ .h_align(match horizontal_alignment {
+ iced_native::text::HorizontalAlignment::Left => {
+ wgpu_glyph::HorizontalAlign::Left
+ }
+ iced_native::text::HorizontalAlignment::Center => {
+ wgpu_glyph::HorizontalAlign::Center
+ }
+ iced_native::text::HorizontalAlignment::Right => {
+ wgpu_glyph::HorizontalAlign::Right
+ }
+ })
+ .v_align(match vertical_alignment {
+ iced_native::text::VerticalAlignment::Top => {
+ wgpu_glyph::VerticalAlign::Top
+ }
+ iced_native::text::VerticalAlignment::Center => {
+ wgpu_glyph::VerticalAlign::Center
+ }
+ iced_native::text::VerticalAlignment::Bottom => {
+ wgpu_glyph::VerticalAlign::Bottom
+ }
+ }),
+ ..Default::default()
+ })
+ }
+ Primitive::Quad {
+ bounds,
+ background,
+ border_radius,
+ } => {
self.quads.push(Quad {
position: [bounds.x, bounds.y],
scale: [bounds.width, bounds.height],
color: match background {
Background::Color(color) => color.into_linear(),
},
+ border_radius: u32::from(*border_radius),
});
}
}
diff --git a/wgpu/src/renderer/button.rs b/wgpu/src/renderer/button.rs
index f75b44f7..00fcd0eb 100644
--- a/wgpu/src/renderer/button.rs
+++ b/wgpu/src/renderer/button.rs
@@ -1,22 +1,26 @@
-use crate::{Background, Primitive, Renderer};
-use iced_native::{button, Button, Color, Layout, Length, Node, Point, Style};
+use crate::{Primitive, Renderer};
+use iced_native::{
+ button, Align, Background, Button, Color, Layout, Length, Node, Point,
+ Style,
+};
impl button::Renderer for Renderer {
- fn node<Message>(&self, button: &Button<Message>) -> Node {
+ fn node<Message>(&self, button: &Button<Message, Self>) -> Node {
let style = Style::default()
.width(button.width)
- .min_height(Length::Units(30))
+ .padding(button.padding)
.min_width(Length::Units(100))
- .align_self(button.align_self);
+ .align_self(button.align_self)
+ .align_items(Align::Stretch);
- Node::new(style)
+ Node::with_children(style, vec![button.content.node(self)])
}
fn draw<Message>(
&mut self,
- button: &Button<Message>,
+ button: &Button<Message, Self>,
layout: Layout<'_>,
- _cursor_position: Point,
+ cursor_position: Point,
) -> Self::Primitive {
let bounds = layout.bounds();
@@ -24,18 +28,21 @@ impl button::Renderer for Renderer {
primitives: vec![
Primitive::Quad {
bounds,
- background: Background::Color(Color {
- r: 0.8,
- b: 0.8,
- g: 0.8,
- a: 1.0,
- }),
- },
- Primitive::Text {
- content: button.label.clone(),
- size: 20.0,
- bounds: layout.bounds(),
+ background: button.background.unwrap_or(Background::Color(
+ Color {
+ r: 0.8,
+ b: 0.8,
+ g: 0.8,
+ a: 1.0,
+ },
+ )),
+ border_radius: button.border_radius,
},
+ button.content.draw(
+ self,
+ layout.children().next().unwrap(),
+ cursor_position,
+ ),
],
}
}
diff --git a/wgpu/src/renderer/checkbox.rs b/wgpu/src/renderer/checkbox.rs
index c94a2157..16d5734f 100644
--- a/wgpu/src/renderer/checkbox.rs
+++ b/wgpu/src/renderer/checkbox.rs
@@ -2,7 +2,7 @@ use crate::{Primitive, Renderer};
use iced_native::{checkbox, Checkbox, Layout, Node, Point, Style};
impl checkbox::Renderer for Renderer {
- fn node<Message>(&mut self, _checkbox: &Checkbox<Message>) -> Node {
+ fn node<Message>(&self, _checkbox: &Checkbox<Message>) -> Node {
Node::new(Style::default())
}
diff --git a/wgpu/src/renderer/image.rs b/wgpu/src/renderer/image.rs
index 6ff39d30..bacc430d 100644
--- a/wgpu/src/renderer/image.rs
+++ b/wgpu/src/renderer/image.rs
@@ -2,7 +2,7 @@ use crate::{Primitive, Renderer};
use iced_native::{image, Image, Layout, Node, Style};
impl image::Renderer<&str> for Renderer {
- fn node(&mut self, _image: &Image<&str>) -> Node {
+ fn node(&self, _image: &Image<&str>) -> Node {
Node::new(Style::default())
}
diff --git a/wgpu/src/renderer/radio.rs b/wgpu/src/renderer/radio.rs
index ce419ae0..fdc0a0fc 100644
--- a/wgpu/src/renderer/radio.rs
+++ b/wgpu/src/renderer/radio.rs
@@ -2,7 +2,7 @@ use crate::{Primitive, Renderer};
use iced_native::{radio, Layout, Node, Point, Radio, Style};
impl radio::Renderer for Renderer {
- fn node<Message>(&mut self, _checkbox: &Radio<Message>) -> Node {
+ fn node<Message>(&self, _checkbox: &Radio<Message>) -> Node {
Node::new(Style::default())
}
diff --git a/wgpu/src/renderer/text.rs b/wgpu/src/renderer/text.rs
index 4434cc22..c89c0b3e 100644
--- a/wgpu/src/renderer/text.rs
+++ b/wgpu/src/renderer/text.rs
@@ -1,5 +1,5 @@
use crate::{Primitive, Renderer};
-use iced_native::{text, Layout, Node, Style, Text};
+use iced_native::{text, Color, Layout, Node, Style, Text};
use wgpu_glyph::{GlyphCruncher, Section};
@@ -72,6 +72,9 @@ impl text::Renderer for Renderer {
content: text.content.clone(),
size: f32::from(text.size.unwrap_or(20)),
bounds: layout.bounds(),
+ color: text.color.unwrap_or(Color::BLACK),
+ horizontal_alignment: text.horizontal_alignment,
+ vertical_alignment: text.vertical_alignment,
}
}
}
generated by cgit (git 2.34.1) at 2025-05-08 02:00:48 +0000