summaryrefslogtreecommitdiffstats
path: root/examples/tour/renderer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--examples/tour/renderer/image.rs51
-rw-r--r--examples/tour/src/iced_ggez/renderer.rs (renamed from examples/tour/renderer.rs)20
-rw-r--r--examples/tour/src/iced_ggez/renderer/button.rs (renamed from examples/tour/renderer/button.rs)29
-rw-r--r--examples/tour/src/iced_ggez/renderer/checkbox.rs (renamed from examples/tour/renderer/checkbox.rs)46
-rw-r--r--examples/tour/src/iced_ggez/renderer/debugger.rs (renamed from examples/tour/renderer/debugger.rs)16
-rw-r--r--examples/tour/src/iced_ggez/renderer/radio.rs (renamed from examples/tour/renderer/radio.rs)45
-rw-r--r--examples/tour/src/iced_ggez/renderer/slider.rs (renamed from examples/tour/renderer/slider.rs)35
-rw-r--r--examples/tour/src/iced_ggez/renderer/text.rs (renamed from examples/tour/renderer/text.rs)62
8 files changed, 170 insertions, 134 deletions
diff --git a/examples/tour/renderer/image.rs b/examples/tour/renderer/image.rs
deleted file mode 100644
index c3ead5c9..00000000
--- a/examples/tour/renderer/image.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use super::Renderer;
-
-use ggez::{graphics, nalgebra};
-use iced::image;
-
-impl image::Renderer<graphics::Image> for Renderer<'_> {
- fn node(
- &self,
- style: iced::Style,
- image: &graphics::Image,
- width: Option<u16>,
- height: Option<u16>,
- _source: Option<iced::Rectangle<u16>>,
- ) -> iced::Node {
- let aspect_ratio = image.width() as f32 / image.height() as f32;
-
- let style = match (width, height) {
- (Some(width), Some(height)) => style.width(width).height(height),
- (Some(width), None) => style
- .width(width)
- .height((width as f32 / aspect_ratio).round() as u16),
- (None, Some(height)) => style
- .height(height)
- .width((height as f32 * aspect_ratio).round() as u16),
- (None, None) => style.width(image.width()).height(image.height()),
- };
-
- iced::Node::new(style)
- }
-
- fn draw(
- &mut self,
- image: &graphics::Image,
- bounds: iced::Rectangle,
- _source: Option<iced::Rectangle<u16>>,
- ) {
- // We should probably use batches to draw images efficiently and keep
- // draw side-effect free, but this is good enough for the example.
- graphics::draw(
- self.context,
- image,
- graphics::DrawParam::new()
- .dest(nalgebra::Point2::new(bounds.x, bounds.y))
- .scale(nalgebra::Vector2::new(
- bounds.width / image.width() as f32,
- bounds.height / image.height() as f32,
- )),
- )
- .expect("Draw image");
- }
-}
diff --git a/examples/tour/renderer.rs b/examples/tour/src/iced_ggez/renderer.rs
index 8746dd96..c0e6d559 100644
--- a/examples/tour/renderer.rs
+++ b/examples/tour/src/iced_ggez/renderer.rs
@@ -11,8 +11,11 @@ use ggez::graphics::{
};
use ggez::Context;
+pub use image::Cache;
+
pub struct Renderer<'a> {
pub context: &'a mut Context,
+ pub images: &'a mut image::Cache,
pub sprites: SpriteBatch,
pub spritesheet: Image,
pub font: Font,
@@ -20,14 +23,16 @@ pub struct Renderer<'a> {
debug_mesh: Option<MeshBuilder>,
}
-impl Renderer<'_> {
+impl<'a> Renderer<'a> {
pub fn new(
- context: &mut Context,
+ context: &'a mut Context,
+ images: &'a mut image::Cache,
spritesheet: Image,
font: Font,
- ) -> Renderer {
+ ) -> Renderer<'a> {
Renderer {
context,
+ images,
sprites: SpriteBatch::new(spritesheet.clone()),
spritesheet,
font,
@@ -61,3 +66,12 @@ impl Renderer<'_> {
}
}
}
+
+pub fn into_color(color: iced_native::Color) -> graphics::Color {
+ graphics::Color {
+ r: color.r,
+ g: color.g,
+ b: color.b,
+ a: color.a,
+ }
+}
diff --git a/examples/tour/renderer/button.rs b/examples/tour/src/iced_ggez/renderer/button.rs
index 486e07ed..78a5de07 100644
--- a/examples/tour/renderer/button.rs
+++ b/examples/tour/src/iced_ggez/renderer/button.rs
@@ -2,7 +2,7 @@ use super::Renderer;
use ggez::graphics::{
self, Align, Color, DrawParam, Rect, Scale, Text, TextFragment, WHITE,
};
-use iced::{button, MouseCursor};
+use iced_native::{button, Button, Layout, Length, MouseCursor, Node, Style};
const LEFT: Rect = Rect {
x: 0.0,
@@ -26,20 +26,29 @@ const RIGHT: Rect = Rect {
};
impl button::Renderer for Renderer<'_> {
- fn draw(
+ fn node<Message>(&self, button: &Button<'_, Message>) -> Node {
+ let style = Style::default()
+ .width(button.width)
+ .height(Length::Units(LEFT.h as u16))
+ .min_width(Length::Units(100))
+ .align_self(button.align_self);
+
+ Node::new(style)
+ }
+
+ fn draw<Message>(
&mut self,
- cursor_position: iced::Point,
- mut bounds: iced::Rectangle,
- state: &button::State,
- label: &str,
- class: button::Class,
+ button: &Button<'_, Message>,
+ layout: Layout<'_>,
+ cursor_position: iced_native::Point,
) -> MouseCursor {
+ let mut bounds = layout.bounds();
let mouse_over = bounds.contains(cursor_position);
let mut state_offset = 0.0;
if mouse_over {
- if state.is_pressed() {
+ if button.state.is_pressed() {
bounds.y += 4.0;
state_offset = RIGHT.x + RIGHT.w;
} else {
@@ -47,7 +56,7 @@ impl button::Renderer for Renderer<'_> {
}
}
- let class_index = match class {
+ let class_index = match button.class {
button::Class::Primary => 0,
button::Class::Secondary => 1,
button::Class::Positive => 2,
@@ -103,7 +112,7 @@ impl button::Renderer for Renderer<'_> {
});
let mut text = Text::new(TextFragment {
- text: String::from(label),
+ text: button.label.clone(),
font: Some(self.font),
scale: Some(Scale { x: 20.0, y: 20.0 }),
..Default::default()
diff --git a/examples/tour/renderer/checkbox.rs b/examples/tour/src/iced_ggez/renderer/checkbox.rs
index 20a91be5..807185d9 100644
--- a/examples/tour/renderer/checkbox.rs
+++ b/examples/tour/src/iced_ggez/renderer/checkbox.rs
@@ -1,7 +1,10 @@
use super::Renderer;
use ggez::graphics::{DrawParam, Rect};
-use iced::{checkbox, MouseCursor};
+use iced_native::{
+ checkbox, text, Align, Checkbox, Column, Layout, Length, MouseCursor, Node,
+ Row, Text, Widget,
+};
const SPRITE: Rect = Rect {
x: 98.0,
@@ -10,14 +13,41 @@ const SPRITE: Rect = Rect {
h: 28.0,
};
-impl checkbox::Renderer for Renderer<'_> {
- fn draw(
+impl checkbox::Renderer for Renderer<'_>
+where
+ Self: text::Renderer,
+{
+ fn node<Message>(&mut self, checkbox: &Checkbox<Message>) -> Node {
+ Row::<(), Self>::new()
+ .spacing(15)
+ .align_items(Align::Center)
+ .push(
+ Column::new()
+ .width(Length::Units(SPRITE.w as u16))
+ .height(Length::Units(SPRITE.h as u16)),
+ )
+ .push(Text::new(&checkbox.label))
+ .node(self)
+ }
+
+ fn draw<Message>(
&mut self,
- cursor_position: iced::Point,
- bounds: iced::Rectangle,
- text_bounds: iced::Rectangle,
- is_checked: bool,
+ checkbox: &Checkbox<Message>,
+ layout: Layout<'_>,
+ cursor_position: iced_native::Point,
) -> MouseCursor {
+ let bounds = layout.bounds();
+ let children: Vec<_> = layout.children().collect();
+ let text_bounds = children[1].bounds();
+
+ let mut text = Text::new(&checkbox.label);
+
+ if let Some(label_color) = checkbox.label_color {
+ text = text.color(label_color);
+ }
+
+ text::Renderer::draw(self, &text, children[1]);
+
let mouse_over = bounds.contains(cursor_position)
|| text_bounds.contains(cursor_position);
@@ -39,7 +69,7 @@ impl checkbox::Renderer for Renderer<'_> {
..DrawParam::default()
});
- if is_checked {
+ if checkbox.is_checked {
self.sprites.add(DrawParam {
src: Rect {
x: (SPRITE.x + SPRITE.w * 2.0) / width,
diff --git a/examples/tour/renderer/debugger.rs b/examples/tour/src/iced_ggez/renderer/debugger.rs
index 98124795..ffb658af 100644
--- a/examples/tour/renderer/debugger.rs
+++ b/examples/tour/src/iced_ggez/renderer/debugger.rs
@@ -1,10 +1,12 @@
-use super::Renderer;
-use ggez::graphics::{Color, DrawMode, MeshBuilder, Rect};
+use super::{into_color, Renderer};
+use ggez::graphics::{DrawMode, MeshBuilder, Rect};
-impl iced::renderer::Debugger for Renderer<'_> {
- type Color = Color;
-
- fn explain(&mut self, layout: &iced::Layout<'_>, color: Color) {
+impl iced_native::renderer::Debugger for Renderer<'_> {
+ fn explain(
+ &mut self,
+ layout: &iced_native::Layout<'_>,
+ color: iced_native::Color,
+ ) {
let bounds = layout.bounds();
let mut debug_mesh =
@@ -18,7 +20,7 @@ impl iced::renderer::Debugger for Renderer<'_> {
w: bounds.width,
h: bounds.height,
},
- color,
+ into_color(color),
);
self.debug_mesh = Some(debug_mesh);
diff --git a/examples/tour/renderer/radio.rs b/examples/tour/src/iced_ggez/renderer/radio.rs
index 0f7815d6..dbd29ecd 100644
--- a/examples/tour/renderer/radio.rs
+++ b/examples/tour/src/iced_ggez/renderer/radio.rs
@@ -1,7 +1,10 @@
use super::Renderer;
use ggez::graphics::{DrawParam, Rect};
-use iced::{radio, MouseCursor, Point, Rectangle};
+use iced_native::{
+ radio, text, Align, Column, Layout, Length, MouseCursor, Node, Point,
+ Radio, Row, Text, Widget,
+};
const SPRITE: Rect = Rect {
x: 98.0,
@@ -10,15 +13,41 @@ const SPRITE: Rect = Rect {
h: 28.0,
};
-impl radio::Renderer for Renderer<'_> {
- fn draw(
+impl radio::Renderer for Renderer<'_>
+where
+ Self: text::Renderer,
+{
+ fn node<Message>(&mut self, radio: &Radio<Message>) -> Node {
+ Row::<(), Self>::new()
+ .spacing(15)
+ .align_items(Align::Center)
+ .push(
+ Column::new()
+ .width(Length::Units(SPRITE.w as u16))
+ .height(Length::Units(SPRITE.h as u16)),
+ )
+ .push(Text::new(&radio.label))
+ .node(self)
+ }
+
+ fn draw<Message>(
&mut self,
+ radio: &Radio<Message>,
+ layout: Layout<'_>,
cursor_position: Point,
- bounds: Rectangle,
- bounds_with_label: Rectangle,
- is_selected: bool,
) -> MouseCursor {
- let mouse_over = bounds_with_label.contains(cursor_position);
+ let children: Vec<_> = layout.children().collect();
+
+ let mut text = Text::new(&radio.label);
+
+ if let Some(label_color) = radio.label_color {
+ text = text.color(label_color);
+ }
+
+ text::Renderer::draw(self, &text, children[1]);
+
+ let bounds = layout.bounds();
+ let mouse_over = bounds.contains(cursor_position);
let width = self.spritesheet.width() as f32;
let height = self.spritesheet.height() as f32;
@@ -38,7 +67,7 @@ impl radio::Renderer for Renderer<'_> {
..DrawParam::default()
});
- if is_selected {
+ if radio.is_selected {
self.sprites.add(DrawParam {
src: Rect {
x: (SPRITE.x + SPRITE.w * 2.0) / width,
diff --git a/examples/tour/renderer/slider.rs b/examples/tour/src/iced_ggez/renderer/slider.rs
index 146cee18..60c40c55 100644
--- a/examples/tour/renderer/slider.rs
+++ b/examples/tour/src/iced_ggez/renderer/slider.rs
@@ -1,8 +1,9 @@
use super::Renderer;
use ggez::graphics::{DrawParam, Rect};
-use iced::{slider, MouseCursor, Point, Rectangle};
-use std::ops::RangeInclusive;
+use iced_native::{
+ slider, Layout, Length, MouseCursor, Node, Point, Slider, Style,
+};
const RAIL: Rect = Rect {
x: 98.0,
@@ -19,14 +20,22 @@ const MARKER: Rect = Rect {
};
impl slider::Renderer for Renderer<'_> {
- fn draw(
+ fn node<Message>(&self, slider: &Slider<'_, Message>) -> Node {
+ let style = Style::default()
+ .width(slider.width)
+ .height(Length::Units(25))
+ .min_width(Length::Units(100));
+
+ Node::new(style)
+ }
+
+ fn draw<Message>(
&mut self,
+ slider: &Slider<'_, Message>,
+ layout: Layout<'_>,
cursor_position: Point,
- bounds: Rectangle,
- state: &slider::State,
- range: RangeInclusive<f32>,
- value: f32,
) -> MouseCursor {
+ let bounds = layout.bounds();
let width = self.spritesheet.width() as f32;
let height = self.spritesheet.height() as f32;
@@ -48,13 +57,14 @@ impl slider::Renderer for Renderer<'_> {
..DrawParam::default()
});
- let (range_start, range_end) = range.into_inner();
+ let (range_start, range_end) = slider.range.clone().into_inner();
let marker_offset = (bounds.width - MARKER.w as f32)
- * ((value - range_start) / (range_end - range_start).max(1.0));
+ * ((slider.value - range_start)
+ / (range_end - range_start).max(1.0));
let mouse_over = bounds.contains(cursor_position);
- let is_active = state.is_dragging() || mouse_over;
+ let is_active = slider.state.is_dragging() || mouse_over;
self.sprites.add(DrawParam {
src: Rect {
@@ -66,12 +76,13 @@ impl slider::Renderer for Renderer<'_> {
},
dest: ggez::mint::Point2 {
x: bounds.x + marker_offset.round(),
- y: bounds.y + (if state.is_dragging() { 2.0 } else { 0.0 }),
+ y: bounds.y
+ + (if slider.state.is_dragging() { 2.0 } else { 0.0 }),
},
..DrawParam::default()
});
- if state.is_dragging() {
+ if slider.state.is_dragging() {
MouseCursor::Grabbing
} else if mouse_over {
MouseCursor::Grab
diff --git a/examples/tour/renderer/text.rs b/examples/tour/src/iced_ggez/renderer/text.rs
index ecf1481e..b51cc220 100644
--- a/examples/tour/renderer/text.rs
+++ b/examples/tour/src/iced_ggez/renderer/text.rs
@@ -1,20 +1,15 @@
-use super::Renderer;
-use ggez::graphics::{self, mint, Align, Color, Scale, Text, TextFragment};
+use super::{into_color, Renderer};
+use ggez::graphics::{self, mint, Align, Scale, Text, TextFragment};
-use iced::text;
+use iced_native::{text, Layout, Node, Style};
use std::cell::RefCell;
use std::f32;
-impl text::Renderer<Color> for Renderer<'_> {
- fn node(
- &self,
- style: iced::Style,
- content: &str,
- size: Option<u16>,
- ) -> iced::Node {
+impl text::Renderer for Renderer<'_> {
+ fn node(&self, text: &iced_native::Text) -> Node {
let font = self.font;
let font_cache = graphics::font_cache(self.context);
- let content = String::from(content);
+ let content = String::from(&text.content);
// TODO: Investigate why stretch tries to measure this MANY times
// with every ancestor's bounds.
@@ -23,20 +18,22 @@ impl text::Renderer<Color> for Renderer<'_> {
// I noticed that the first measure is the one that matters in
// practice. Here, we use a RefCell to store the cached measurement.
let measure = RefCell::new(None);
- let size = size.map(f32::from).unwrap_or(self.font_size);
+ let size = text.size.map(f32::from).unwrap_or(self.font_size);
- iced::Node::with_measure(style, move |bounds| {
+ let style = Style::default().width(text.width);
+
+ iced_native::Node::with_measure(style, move |bounds| {
let mut measure = measure.borrow_mut();
if measure.is_none() {
let bounds = (
match bounds.width {
- iced::Number::Undefined => f32::INFINITY,
- iced::Number::Defined(w) => w,
+ iced_native::Number::Undefined => f32::INFINITY,
+ iced_native::Number::Defined(w) => w,
},
match bounds.height {
- iced::Number::Undefined => f32::INFINITY,
- iced::Number::Defined(h) => h,
+ iced_native::Number::Undefined => f32::INFINITY,
+ iced_native::Number::Defined(h) => h,
},
);
@@ -57,7 +54,7 @@ impl text::Renderer<Color> for Renderer<'_> {
let (width, height) = font_cache.dimensions(&text);
- let size = iced::Size {
+ let size = iced_native::Size {
width: width as f32,
height: height as f32,
};
@@ -75,30 +72,23 @@ impl text::Renderer<Color> for Renderer<'_> {
})
}
- fn draw(
- &mut self,
- bounds: iced::Rectangle,
- content: &str,
- size: Option<u16>,
- color: Option<Color>,
- horizontal_alignment: text::HorizontalAlignment,
- _vertical_alignment: text::VerticalAlignment,
- ) {
- let size = size.map(f32::from).unwrap_or(self.font_size);
-
- let mut text = Text::new(TextFragment {
- text: String::from(content),
+ fn draw(&mut self, text: &iced_native::Text, layout: Layout<'_>) {
+ let size = text.size.map(f32::from).unwrap_or(self.font_size);
+ let bounds = layout.bounds();
+
+ let mut ggez_text = Text::new(TextFragment {
+ text: text.content.clone(),
font: Some(self.font),
scale: Some(Scale { x: size, y: size }),
..Default::default()
});
- text.set_bounds(
+ ggez_text.set_bounds(
mint::Point2 {
x: bounds.width,
y: bounds.height,
},
- match horizontal_alignment {
+ match text.horizontal_alignment {
text::HorizontalAlignment::Left => graphics::Align::Left,
text::HorizontalAlignment::Center => graphics::Align::Center,
text::HorizontalAlignment::Right => graphics::Align::Right,
@@ -107,12 +97,14 @@ impl text::Renderer<Color> for Renderer<'_> {
graphics::queue_text(
self.context,
- &text,
+ &ggez_text,
mint::Point2 {
x: bounds.x,
y: bounds.y,
},
- color.or(Some(graphics::BLACK)),
+ text.color
+ .or(Some(iced_native::Color::BLACK))
+ .map(into_color),
);
}
}
generated by cgit (git 2.34.1) at 2025-06-01 06:07:17 +0000