summaryrefslogtreecommitdiffstats
path: root/wgpu/src
diff options
context:
space:
mode:
Diffstat (limited to 'wgpu/src')
-rw-r--r--wgpu/src/renderer.rs22
-rw-r--r--wgpu/src/renderer/checkbox.rs1
-rw-r--r--wgpu/src/renderer/scrollable.rs14
-rw-r--r--wgpu/src/renderer/text.rs2
-rw-r--r--wgpu/src/renderer/text_input.rs140
5 files changed, 161 insertions, 18 deletions
diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index a70693af..fbc39327 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -23,6 +23,7 @@ mod row;
mod scrollable;
mod slider;
mod text;
+mod text_input;
pub struct Renderer {
surface: Surface,
@@ -148,7 +149,8 @@ impl Renderer {
});
let mut layers = Vec::new();
- let mut current = Layer::new(
+
+ layers.push(Layer::new(
Rectangle {
x: 0,
y: 0,
@@ -156,10 +158,9 @@ impl Renderer {
height: u32::from(target.height),
},
0,
- );
+ ));
- self.draw_primitive(primitive, &mut current, &mut layers);
- layers.push(current);
+ self.draw_primitive(primitive, &mut layers);
for layer in layers {
self.flush(
@@ -178,15 +179,16 @@ impl Renderer {
fn draw_primitive<'a>(
&mut self,
primitive: &'a Primitive,
- layer: &mut Layer<'a>,
layers: &mut Vec<Layer<'a>>,
) {
+ let layer = layers.last_mut().unwrap();
+
match primitive {
Primitive::None => {}
Primitive::Group { primitives } => {
// TODO: Inspect a bit and regroup (?)
for primitive in primitives {
- self.draw_primitive(primitive, layer, layers)
+ self.draw_primitive(primitive, layers)
}
}
Primitive::Text {
@@ -275,7 +277,7 @@ impl Renderer {
offset,
content,
} => {
- let mut new_layer = Layer::new(
+ let clip_layer = Layer::new(
Rectangle {
x: bounds.x as u32,
y: bounds.y as u32 - layer.y_offset,
@@ -285,8 +287,12 @@ impl Renderer {
layer.y_offset + offset,
);
+ let new_layer = Layer::new(layer.bounds, layer.y_offset);
+
+ layers.push(clip_layer);
+
// TODO: Primitive culling
- self.draw_primitive(content, &mut new_layer, layers);
+ self.draw_primitive(content, layers);
layers.push(new_layer);
}
diff --git a/wgpu/src/renderer/checkbox.rs b/wgpu/src/renderer/checkbox.rs
index fd3f08b1..ea7a4c0b 100644
--- a/wgpu/src/renderer/checkbox.rs
+++ b/wgpu/src/renderer/checkbox.rs
@@ -10,6 +10,7 @@ const SIZE: f32 = 28.0;
impl checkbox::Renderer for Renderer {
fn node<Message>(&self, checkbox: &Checkbox<Message>) -> Node {
Row::<(), Self>::new()
+ .width(Length::Fill)
.spacing(15)
.align_items(Align::Center)
.push(
diff --git a/wgpu/src/renderer/scrollable.rs b/wgpu/src/renderer/scrollable.rs
index 7bce3a68..f1d87857 100644
--- a/wgpu/src/renderer/scrollable.rs
+++ b/wgpu/src/renderer/scrollable.rs
@@ -5,7 +5,7 @@ use iced_native::{
};
const SCROLLBAR_WIDTH: u16 = 10;
-const SCROLLBAR_MARGIN: u16 = 10;
+const SCROLLBAR_MARGIN: u16 = 5;
fn scrollbar_bounds(bounds: Rectangle) -> Rectangle {
Rectangle {
@@ -56,7 +56,7 @@ impl scrollable::Renderer for Renderer {
let (content, mouse_cursor) =
scrollable.content.draw(self, content, cursor_position);
- let primitive = Primitive::Clip {
+ let clip = Primitive::Clip {
bounds,
offset,
content: Box::new(content),
@@ -107,19 +107,15 @@ impl scrollable::Renderer for Renderer {
};
Primitive::Group {
- primitives: vec![
- primitive,
- scrollbar_background,
- scrollbar,
- ],
+ primitives: vec![clip, scrollbar_background, scrollbar],
}
} else {
Primitive::Group {
- primitives: vec![primitive, scrollbar],
+ primitives: vec![clip, scrollbar],
}
}
} else {
- primitive
+ clip
},
if is_mouse_over_scrollbar
|| scrollable.state.is_scrollbar_grabbed()
diff --git a/wgpu/src/renderer/text.rs b/wgpu/src/renderer/text.rs
index 8fbade4e..606ebe9f 100644
--- a/wgpu/src/renderer/text.rs
+++ b/wgpu/src/renderer/text.rs
@@ -47,7 +47,7 @@ impl text::Renderer for Renderer {
let (width, height) = if let Some(bounds) =
glyph_brush.borrow_mut().glyph_bounds(&text)
{
- (bounds.width(), bounds.height())
+ (bounds.width().round(), bounds.height().round())
} else {
(0.0, 0.0)
};
diff --git a/wgpu/src/renderer/text_input.rs b/wgpu/src/renderer/text_input.rs
new file mode 100644
index 00000000..30e06878
--- /dev/null
+++ b/wgpu/src/renderer/text_input.rs
@@ -0,0 +1,140 @@
+use crate::{Primitive, Renderer};
+
+use iced_native::{
+ text::HorizontalAlignment, text::VerticalAlignment, text_input, Background,
+ Color, MouseCursor, Point, Rectangle, TextInput,
+};
+use std::f32;
+
+impl text_input::Renderer for Renderer {
+ fn default_size(&self) -> u16 {
+ // TODO: Make this configurable
+ 20
+ }
+
+ fn draw<Message>(
+ &mut self,
+ text_input: &TextInput<Message>,
+ bounds: Rectangle,
+ text_bounds: Rectangle,
+ cursor_position: Point,
+ ) -> Self::Output {
+ let is_mouse_over = bounds.contains(cursor_position);
+
+ let border = Primitive::Quad {
+ bounds,
+ background: Background::Color(
+ if is_mouse_over || text_input.state.is_focused {
+ Color {
+ r: 0.5,
+ g: 0.5,
+ b: 0.5,
+ a: 1.0,
+ }
+ } else {
+ Color {
+ r: 0.7,
+ g: 0.7,
+ b: 0.7,
+ a: 1.0,
+ }
+ },
+ ),
+ border_radius: 5,
+ };
+
+ let input = Primitive::Quad {
+ bounds: Rectangle {
+ x: bounds.x + 1.0,
+ y: bounds.y + 1.0,
+ width: bounds.width - 2.0,
+ height: bounds.height - 2.0,
+ },
+ background: Background::Color(Color::WHITE),
+ border_radius: 5,
+ };
+
+ let size = f32::from(text_input.size.unwrap_or(self.default_size()));
+
+ let value = Primitive::Clip {
+ bounds: text_bounds,
+ offset: 0,
+ content: Box::new(Primitive::Text {
+ content: if text_input.value.is_empty() {
+ text_input.placeholder.clone()
+ } else {
+ text_input.value.clone()
+ },
+ color: if text_input.value.is_empty() {
+ Color {
+ r: 0.7,
+ g: 0.7,
+ b: 0.7,
+ a: 1.0,
+ }
+ } else {
+ Color {
+ r: 0.3,
+ g: 0.3,
+ b: 0.3,
+ a: 1.0,
+ }
+ },
+ bounds: Rectangle {
+ width: f32::INFINITY,
+ ..text_bounds
+ },
+ size,
+ horizontal_alignment: HorizontalAlignment::Left,
+ vertical_alignment: VerticalAlignment::Center,
+ }),
+ };
+
+ (
+ Primitive::Group {
+ primitives: if text_input.state.is_focused {
+ use wgpu_glyph::{GlyphCruncher, Scale, Section};
+
+ let mut text_value_width = self
+ .glyph_brush
+ .borrow_mut()
+ .glyph_bounds(Section {
+ text: &text_input.value,
+ bounds: (f32::INFINITY, text_bounds.height),
+ scale: Scale { x: size, y: size },
+ ..Default::default()
+ })
+ .map(|bounds| bounds.width().round())
+ .unwrap_or(0.0);
+
+ let spaces_at_the_end = text_input.value.len()
+ - text_input.value.trim_end().len();
+
+ if spaces_at_the_end > 0 {
+ text_value_width += spaces_at_the_end as f32 * 5.0;
+ }
+
+ let cursor = Primitive::Quad {
+ bounds: Rectangle {
+ x: text_bounds.x + text_value_width,
+ y: text_bounds.y,
+ width: 1.0,
+ height: text_bounds.height,
+ },
+ background: Background::Color(Color::BLACK),
+ border_radius: 0,
+ };
+
+ vec![border, input, value, cursor]
+ } else {
+ vec![border, input, value]
+ },
+ },
+ if is_mouse_over {
+ MouseCursor::Text
+ } else {
+ MouseCursor::OutOfBounds
+ },
+ )
+ }
+}
generated by cgit (git 2.34.1) at 2025-04-17 19:23:00 +0000