summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--wgpu/src/renderer.rs61
-rw-r--r--wgpu/src/renderer/widget/button.rs6
-rw-r--r--wgpu/src/renderer/widget/checkbox.rs6
-rw-r--r--wgpu/src/renderer/widget/column.rs12
-rw-r--r--wgpu/src/renderer/widget/container.rs6
-rw-r--r--wgpu/src/renderer/widget/image.rs4
-rw-r--r--wgpu/src/renderer/widget/pane_grid.rs25
-rw-r--r--wgpu/src/renderer/widget/progress_bar.rs4
-rw-r--r--wgpu/src/renderer/widget/radio.rs6
-rw-r--r--wgpu/src/renderer/widget/row.rs12
-rw-r--r--wgpu/src/renderer/widget/scrollable.rs10
-rw-r--r--wgpu/src/renderer/widget/slider.rs8
-rw-r--r--wgpu/src/renderer/widget/space.rs4
-rw-r--r--wgpu/src/renderer/widget/svg.rs4
-rw-r--r--wgpu/src/renderer/widget/text.rs4
-rw-r--r--wgpu/src/renderer/widget/text_input.rs9
16 files changed, 98 insertions, 83 deletions
diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index ca9364c1..71b4af38 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -7,8 +7,7 @@ use crate::{
use crate::image::{self, Image};
use iced_native::{
- layout, Background, Color, Layout, MouseCursor, Point, Rectangle, Vector,
- Widget,
+ layout, mouse, Background, Color, Layout, Point, Rectangle, Vector, Widget,
};
mod widget;
@@ -29,7 +28,7 @@ pub struct Renderer {
struct Layer<'a> {
bounds: Rectangle<u32>,
quads: Vec<Quad>,
- meshes: Vec<(Point, &'a triangle::Mesh2D)>,
+ meshes: Vec<(Vector, Rectangle<u32>, &'a triangle::Mesh2D)>,
text: Vec<wgpu_glyph::Section<'a>>,
#[cfg(any(feature = "image", feature = "svg"))]
@@ -48,6 +47,12 @@ impl<'a> Layer<'a> {
images: Vec::new(),
}
}
+
+ pub fn intersection(&self, rectangle: Rectangle) -> Option<Rectangle<u32>> {
+ let layer_bounds: Rectangle<f32> = self.bounds.into();
+
+ layer_bounds.intersection(&rectangle).map(Into::into)
+ }
}
impl Renderer {
@@ -88,10 +93,10 @@ impl Renderer {
device: &wgpu::Device,
encoder: &mut wgpu::CommandEncoder,
target: Target<'_>,
- (primitive, mouse_cursor): &(Primitive, MouseCursor),
+ (primitive, mouse_interaction): &(Primitive, mouse::Interaction),
scale_factor: f64,
overlay: &[T],
- ) -> MouseCursor {
+ ) -> mouse::Interaction {
log::debug!("Drawing");
let (width, height) = target.viewport.dimensions();
@@ -126,7 +131,7 @@ impl Renderer {
#[cfg(any(feature = "image", feature = "svg"))]
self.image_pipeline.trim_cache();
- *mouse_cursor
+ *mouse_interaction
}
fn draw_primitive<'a>(
@@ -214,10 +219,20 @@ impl Renderer {
border_color: border_color.into_linear(),
});
}
- Primitive::Mesh2D { origin, buffers } => {
+ Primitive::Mesh2D { size, buffers } => {
let layer = layers.last_mut().unwrap();
- layer.meshes.push((*origin + translation, buffers));
+ // Only draw visible content
+ if let Some(clip_bounds) = layer.intersection(Rectangle::new(
+ Point::new(translation.x, translation.y),
+ *size,
+ )) {
+ layer.meshes.push((
+ translation,
+ clip_bounds.into(),
+ buffers,
+ ));
+ }
}
Primitive::Clip {
bounds,
@@ -226,16 +241,10 @@ impl Renderer {
} => {
let layer = layers.last_mut().unwrap();
- let layer_bounds: Rectangle<f32> = layer.bounds.into();
-
- let clip = Rectangle {
- x: bounds.x + translation.x,
- y: bounds.y + translation.y,
- ..*bounds
- };
-
// Only draw visible content
- if let Some(clip_bounds) = layer_bounds.intersection(&clip) {
+ if let Some(clip_bounds) =
+ layer.intersection(*bounds + translation)
+ {
let clip_layer = Layer::new(clip_bounds.into());
let new_layer = Layer::new(layer.bounds);
@@ -249,15 +258,21 @@ impl Renderer {
layers.push(new_layer);
}
}
-
- Primitive::Cached { origin, cache } => {
+ Primitive::Translate {
+ translation: new_translation,
+ content,
+ } => {
self.draw_primitive(
- translation + Vector::new(origin.x, origin.y),
- &cache,
+ translation + *new_translation,
+ &content,
layers,
);
}
+ Primitive::Cached { cache } => {
+ self.draw_primitive(translation, &cache, layers);
+ }
+
#[cfg(feature = "image")]
Primitive::Image { handle, bounds } => {
let layer = layers.last_mut().unwrap();
@@ -362,8 +377,8 @@ impl Renderer {
target_width,
target_height,
scaled,
+ scale_factor,
&layer.meshes,
- bounds,
);
}
@@ -437,7 +452,7 @@ impl Renderer {
}
impl iced_native::Renderer for Renderer {
- type Output = (Primitive, MouseCursor);
+ type Output = (Primitive, mouse::Interaction);
type Defaults = Defaults;
fn layout<'a, Message>(
diff --git a/wgpu/src/renderer/widget/button.rs b/wgpu/src/renderer/widget/button.rs
index 359b4866..eb225038 100644
--- a/wgpu/src/renderer/widget/button.rs
+++ b/wgpu/src/renderer/widget/button.rs
@@ -1,6 +1,6 @@
use crate::{button::StyleSheet, defaults, Defaults, Primitive, Renderer};
use iced_native::{
- Background, Color, Element, Layout, MouseCursor, Point, Rectangle, Vector,
+ mouse, Background, Color, Element, Layout, Point, Rectangle, Vector,
};
impl iced_native::button::Renderer for Renderer {
@@ -84,9 +84,9 @@ impl iced_native::button::Renderer for Renderer {
content
},
if is_mouse_over {
- MouseCursor::Pointer
+ mouse::Interaction::Pointer
} else {
- MouseCursor::OutOfBounds
+ mouse::Interaction::default()
},
)
}
diff --git a/wgpu/src/renderer/widget/checkbox.rs b/wgpu/src/renderer/widget/checkbox.rs
index c0f1bf21..0340bf62 100644
--- a/wgpu/src/renderer/widget/checkbox.rs
+++ b/wgpu/src/renderer/widget/checkbox.rs
@@ -1,6 +1,6 @@
use crate::{checkbox::StyleSheet, Primitive, Renderer};
use iced_native::{
- checkbox, HorizontalAlignment, MouseCursor, Rectangle, VerticalAlignment,
+ checkbox, mouse, HorizontalAlignment, Rectangle, VerticalAlignment,
};
impl checkbox::Renderer for Renderer {
@@ -54,9 +54,9 @@ impl checkbox::Renderer for Renderer {
},
},
if is_mouse_over {
- MouseCursor::Pointer
+ mouse::Interaction::Pointer
} else {
- MouseCursor::OutOfBounds
+ mouse::Interaction::default()
},
)
}
diff --git a/wgpu/src/renderer/widget/column.rs b/wgpu/src/renderer/widget/column.rs
index 95a7463a..b853276d 100644
--- a/wgpu/src/renderer/widget/column.rs
+++ b/wgpu/src/renderer/widget/column.rs
@@ -1,5 +1,5 @@
use crate::{Primitive, Renderer};
-use iced_native::{column, Element, Layout, MouseCursor, Point};
+use iced_native::{column, mouse, Element, Layout, Point};
impl column::Renderer for Renderer {
fn draw<Message>(
@@ -9,7 +9,7 @@ impl column::Renderer for Renderer {
layout: Layout<'_>,
cursor_position: Point,
) -> Self::Output {
- let mut mouse_cursor = MouseCursor::OutOfBounds;
+ let mut mouse_interaction = mouse::Interaction::default();
(
Primitive::Group {
@@ -17,18 +17,18 @@ impl column::Renderer for Renderer {
.iter()
.zip(layout.children())
.map(|(child, layout)| {
- let (primitive, new_mouse_cursor) =
+ let (primitive, new_mouse_interaction) =
child.draw(self, defaults, layout, cursor_position);
- if new_mouse_cursor > mouse_cursor {
- mouse_cursor = new_mouse_cursor;
+ if new_mouse_interaction > mouse_interaction {
+ mouse_interaction = new_mouse_interaction;
}
primitive
})
.collect(),
},
- mouse_cursor,
+ mouse_interaction,
)
}
}
diff --git a/wgpu/src/renderer/widget/container.rs b/wgpu/src/renderer/widget/container.rs
index dda7dc8a..30cc3f07 100644
--- a/wgpu/src/renderer/widget/container.rs
+++ b/wgpu/src/renderer/widget/container.rs
@@ -21,7 +21,7 @@ impl iced_native::container::Renderer for Renderer {
},
};
- let (content, mouse_cursor) =
+ let (content, mouse_interaction) =
content.draw(self, &defaults, content_layout, cursor_position);
if style.background.is_some() || style.border_width > 0 {
@@ -39,10 +39,10 @@ impl iced_native::container::Renderer for Renderer {
Primitive::Group {
primitives: vec![quad, content],
},
- mouse_cursor,
+ mouse_interaction,
)
} else {
- (content, mouse_cursor)
+ (content, mouse_interaction)
}
}
}
diff --git a/wgpu/src/renderer/widget/image.rs b/wgpu/src/renderer/widget/image.rs
index 70dc5d97..c4c04984 100644
--- a/wgpu/src/renderer/widget/image.rs
+++ b/wgpu/src/renderer/widget/image.rs
@@ -1,5 +1,5 @@
use crate::{Primitive, Renderer};
-use iced_native::{image, Layout, MouseCursor};
+use iced_native::{image, mouse, Layout};
impl image::Renderer for Renderer {
fn dimensions(&self, handle: &image::Handle) -> (u32, u32) {
@@ -16,7 +16,7 @@ impl image::Renderer for Renderer {
handle,
bounds: layout.bounds(),
},
- MouseCursor::OutOfBounds,
+ mouse::Interaction::default(),
)
}
}
diff --git a/wgpu/src/renderer/widget/pane_grid.rs b/wgpu/src/renderer/widget/pane_grid.rs
index 2d201fec..2253e4af 100644
--- a/wgpu/src/renderer/widget/pane_grid.rs
+++ b/wgpu/src/renderer/widget/pane_grid.rs
@@ -1,7 +1,8 @@
use crate::{Primitive, Renderer};
use iced_native::{
+ mouse,
pane_grid::{self, Axis, Pane},
- Element, Layout, MouseCursor, Point, Rectangle, Vector,
+ Element, Layout, Point, Rectangle, Vector,
};
impl pane_grid::Renderer for Renderer {
@@ -22,7 +23,7 @@ impl pane_grid::Renderer for Renderer {
cursor_position
};
- let mut mouse_cursor = MouseCursor::OutOfBounds;
+ let mut mouse_interaction = mouse::Interaction::default();
let mut dragged_pane = None;
let mut panes: Vec<_> = content
@@ -30,11 +31,11 @@ impl pane_grid::Renderer for Renderer {
.zip(layout.children())
.enumerate()
.map(|(i, ((id, pane), layout))| {
- let (primitive, new_mouse_cursor) =
+ let (primitive, new_mouse_interaction) =
pane.draw(self, defaults, layout, pane_cursor_position);
- if new_mouse_cursor > mouse_cursor {
- mouse_cursor = new_mouse_cursor;
+ if new_mouse_interaction > mouse_interaction {
+ mouse_interaction = new_mouse_interaction;
}
if Some(*id) == dragging {
@@ -59,12 +60,12 @@ impl pane_grid::Renderer for Renderer {
height: bounds.height + 0.5,
},
offset: Vector::new(0, 0),
- content: Box::new(Primitive::Cached {
- origin: Point::new(
+ content: Box::new(Primitive::Translate {
+ translation: Vector::new(
cursor_position.x - bounds.x - bounds.width / 2.0,
cursor_position.y - bounds.y - bounds.height / 2.0,
),
- cache: std::sync::Arc::new(pane),
+ content: Box::new(pane),
}),
};
@@ -78,14 +79,14 @@ impl pane_grid::Renderer for Renderer {
(
Primitive::Group { primitives },
if dragging.is_some() {
- MouseCursor::Grabbing
+ mouse::Interaction::Grabbing
} else if let Some(axis) = resizing {
match axis {
- Axis::Horizontal => MouseCursor::ResizingVertically,
- Axis::Vertical => MouseCursor::ResizingHorizontally,
+ Axis::Horizontal => mouse::Interaction::ResizingVertically,
+ Axis::Vertical => mouse::Interaction::ResizingHorizontally,
}
} else {
- mouse_cursor
+ mouse_interaction
},
)
}
diff --git a/wgpu/src/renderer/widget/progress_bar.rs b/wgpu/src/renderer/widget/progress_bar.rs
index 34e33276..2baeeb14 100644
--- a/wgpu/src/renderer/widget/progress_bar.rs
+++ b/wgpu/src/renderer/widget/progress_bar.rs
@@ -1,5 +1,5 @@
use crate::{progress_bar::StyleSheet, Primitive, Renderer};
-use iced_native::{progress_bar, Color, MouseCursor, Rectangle};
+use iced_native::{mouse, progress_bar, Color, Rectangle};
impl progress_bar::Renderer for Renderer {
type Style = Box<dyn StyleSheet>;
@@ -48,7 +48,7 @@ impl progress_bar::Renderer for Renderer {
} else {
background
},
- MouseCursor::OutOfBounds,
+ mouse::Interaction::default(),
)
}
}
diff --git a/wgpu/src/renderer/widget/radio.rs b/wgpu/src/renderer/widget/radio.rs
index 564f066b..2f1461db 100644
--- a/wgpu/src/renderer/widget/radio.rs
+++ b/wgpu/src/renderer/widget/radio.rs
@@ -1,5 +1,5 @@
use crate::{radio::StyleSheet, Primitive, Renderer};
-use iced_native::{radio, Background, Color, MouseCursor, Rectangle};
+use iced_native::{mouse, radio, Background, Color, Rectangle};
const SIZE: f32 = 28.0;
const DOT_SIZE: f32 = SIZE / 2.0;
@@ -55,9 +55,9 @@ impl radio::Renderer for Renderer {
},
},
if is_mouse_over {
- MouseCursor::Pointer
+ mouse::Interaction::Pointer
} else {
- MouseCursor::OutOfBounds
+ mouse::Interaction::default()
},
)
}
diff --git a/wgpu/src/renderer/widget/row.rs b/wgpu/src/renderer/widget/row.rs
index bd9f1a04..d0b7ef09 100644
--- a/wgpu/src/renderer/widget/row.rs
+++ b/wgpu/src/renderer/widget/row.rs
@@ -1,5 +1,5 @@
use crate::{Primitive, Renderer};
-use iced_native::{row, Element, Layout, MouseCursor, Point};
+use iced_native::{mouse, row, Element, Layout, Point};
impl row::Renderer for Renderer {
fn draw<Message>(
@@ -9,7 +9,7 @@ impl row::Renderer for Renderer {
layout: Layout<'_>,
cursor_position: Point,
) -> Self::Output {
- let mut mouse_cursor = MouseCursor::OutOfBounds;
+ let mut mouse_interaction = mouse::Interaction::default();
(
Primitive::Group {
@@ -17,18 +17,18 @@ impl row::Renderer for Renderer {
.iter()
.zip(layout.children())
.map(|(child, layout)| {
- let (primitive, new_mouse_cursor) =
+ let (primitive, new_mouse_interaction) =
child.draw(self, defaults, layout, cursor_position);
- if new_mouse_cursor > mouse_cursor {
- mouse_cursor = new_mouse_cursor;
+ if new_mouse_interaction > mouse_interaction {
+ mouse_interaction = new_mouse_interaction;
}
primitive
})
.collect(),
},
- mouse_cursor,
+ mouse_interaction,
)
}
}
diff --git a/wgpu/src/renderer/widget/scrollable.rs b/wgpu/src/renderer/widget/scrollable.rs
index 732523e3..8a400b82 100644
--- a/wgpu/src/renderer/widget/scrollable.rs
+++ b/wgpu/src/renderer/widget/scrollable.rs
@@ -1,7 +1,5 @@
use crate::{Primitive, Renderer};
-use iced_native::{
- scrollable, Background, Color, MouseCursor, Rectangle, Vector,
-};
+use iced_native::{mouse, scrollable, Background, Color, Rectangle, Vector};
const SCROLLBAR_WIDTH: u16 = 10;
const SCROLLBAR_MARGIN: u16 = 2;
@@ -56,7 +54,7 @@ impl scrollable::Renderer for Renderer {
scrollbar: Option<scrollable::Scrollbar>,
offset: u32,
style_sheet: &Self::Style,
- (content, mouse_cursor): Self::Output,
+ (content, mouse_interaction): Self::Output,
) -> Self::Output {
(
if let Some(scrollbar) = scrollbar {
@@ -118,9 +116,9 @@ impl scrollable::Renderer for Renderer {
content
},
if is_mouse_over_scrollbar || state.is_scroller_grabbed() {
- MouseCursor::Idle
+ mouse::Interaction::Idle
} else {
- mouse_cursor
+ mouse_interaction
},
)
}
diff --git a/wgpu/src/renderer/widget/slider.rs b/wgpu/src/renderer/widget/slider.rs
index c8ebd0da..220feace 100644
--- a/wgpu/src/renderer/widget/slider.rs
+++ b/wgpu/src/renderer/widget/slider.rs
@@ -2,7 +2,7 @@ use crate::{
slider::{HandleShape, StyleSheet},
Primitive, Renderer,
};
-use iced_native::{slider, Background, Color, MouseCursor, Point, Rectangle};
+use iced_native::{mouse, slider, Background, Color, Point, Rectangle};
const HANDLE_HEIGHT: f32 = 22.0;
@@ -95,11 +95,11 @@ impl slider::Renderer for Renderer {
primitives: vec![rail_top, rail_bottom, handle],
},
if is_dragging {
- MouseCursor::Grabbing
+ mouse::Interaction::Grabbing
} else if is_mouse_over {
- MouseCursor::Grab
+ mouse::Interaction::Grab
} else {
- MouseCursor::OutOfBounds
+ mouse::Interaction::default()
},
)
}
diff --git a/wgpu/src/renderer/widget/space.rs b/wgpu/src/renderer/widget/space.rs
index 28e05437..225f7e6c 100644
--- a/wgpu/src/renderer/widget/space.rs
+++ b/wgpu/src/renderer/widget/space.rs
@@ -1,8 +1,8 @@
use crate::{Primitive, Renderer};
-use iced_native::{space, MouseCursor, Rectangle};
+use iced_native::{mouse, space, Rectangle};
impl space::Renderer for Renderer {
fn draw(&mut self, _bounds: Rectangle) -> Self::Output {
- (Primitive::None, MouseCursor::OutOfBounds)
+ (Primitive::None, mouse::Interaction::default())
}
}
diff --git a/wgpu/src/renderer/widget/svg.rs b/wgpu/src/renderer/widget/svg.rs
index 67bc3fe1..f6d6d0ba 100644
--- a/wgpu/src/renderer/widget/svg.rs
+++ b/wgpu/src/renderer/widget/svg.rs
@@ -1,5 +1,5 @@
use crate::{Primitive, Renderer};
-use iced_native::{svg, Layout, MouseCursor};
+use iced_native::{mouse, svg, Layout};
impl svg::Renderer for Renderer {
fn dimensions(&self, handle: &svg::Handle) -> (u32, u32) {
@@ -16,7 +16,7 @@ impl svg::Renderer for Renderer {
handle,
bounds: layout.bounds(),
},
- MouseCursor::OutOfBounds,
+ mouse::Interaction::default(),
)
}
}
diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs
index f27cc430..4605ed06 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/wgpu/src/renderer/widget/text.rs
@@ -1,6 +1,6 @@
use crate::{Primitive, Renderer};
use iced_native::{
- text, Color, Font, HorizontalAlignment, MouseCursor, Rectangle, Size,
+ mouse, text, Color, Font, HorizontalAlignment, Rectangle, Size,
VerticalAlignment,
};
@@ -55,7 +55,7 @@ impl text::Renderer for Renderer {
horizontal_alignment,
vertical_alignment,
},
- MouseCursor::OutOfBounds,
+ mouse::Interaction::default(),
)
}
}
diff --git a/wgpu/src/renderer/widget/text_input.rs b/wgpu/src/renderer/widget/text_input.rs
index 6f72db68..57be6692 100644
--- a/wgpu/src/renderer/widget/text_input.rs
+++ b/wgpu/src/renderer/widget/text_input.rs
@@ -1,9 +1,10 @@
use crate::{text_input::StyleSheet, Primitive, Renderer};
use iced_native::{
+ mouse,
text_input::{self, cursor},
- Background, Color, Font, HorizontalAlignment, MouseCursor, Point,
- Rectangle, Size, Vector, VerticalAlignment,
+ Background, Color, Font, HorizontalAlignment, Point, Rectangle, Size,
+ Vector, VerticalAlignment,
};
use std::f32;
@@ -232,9 +233,9 @@ impl text_input::Renderer for Renderer {
primitives: vec![input, contents],
},
if is_mouse_over {
- MouseCursor::Text
+ mouse::Interaction::Text
} else {
- MouseCursor::OutOfBounds
+ mouse::Interaction::default()
},
)
}
generated by cgit (git 2.34.1) at 2025-05-22 01:15:16 +0000