summaryrefslogtreecommitdiffstats
path: root/wgpu
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-10-30 05:00:12 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-10-30 05:00:12 +0100
commitfedcab6f4f5ffd3a6dfffe7dd41c58df2e314099 (patch)
tree171779a050b783dde926142027ae805a59366ab3 /wgpu
parent63cd0fd8eb1eebae8de7d5141c846fc4ea55d702 (diff)
downloadiced-fedcab6f4f5ffd3a6dfffe7dd41c58df2e314099.tar.gz
iced-fedcab6f4f5ffd3a6dfffe7dd41c58df2e314099.tar.bz2
iced-fedcab6f4f5ffd3a6dfffe7dd41c58df2e314099.zip
Handle some `TextInput` events
Diffstat (limited to 'wgpu')
-rw-r--r--wgpu/src/renderer/checkbox.rs1
-rw-r--r--wgpu/src/renderer/scrollable.rs2
-rw-r--r--wgpu/src/renderer/text.rs2
-rw-r--r--wgpu/src/renderer/text_input.rs38
4 files changed, 23 insertions, 20 deletions
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 e9dfc760..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 {
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
index bcb55d50..f7a93465 100644
--- a/wgpu/src/renderer/text_input.rs
+++ b/wgpu/src/renderer/text_input.rs
@@ -23,21 +23,23 @@ impl text_input::Renderer for Renderer {
let border = Primitive::Quad {
bounds,
- background: Background::Color(if is_mouse_over {
- 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,
- }
- }),
+ 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,
};
@@ -70,9 +72,9 @@ impl text_input::Renderer for Renderer {
}
} else {
Color {
- r: 0.9,
- g: 0.9,
- b: 0.9,
+ r: 0.3,
+ g: 0.3,
+ b: 0.3,
a: 1.0,
}
},