summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer/widget/text_input.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2019-11-07 17:44:27 +0100
committerLibravatar GitHub <noreply@github.com>2019-11-07 17:44:27 +0100
commit59ef7f074c67126dd8bd0ae9cbc82ce2a946258f (patch)
tree5004ae812a39d36b3880d340101806edcf6abd04 /wgpu/src/renderer/widget/text_input.rs
parent6790f4b6e36f21b5db9ef02f5e499df8336abfea (diff)
parente7bd24c13eb0c5c2b8ecf3f09f9e2de315bf8a41 (diff)
downloadiced-59ef7f074c67126dd8bd0ae9cbc82ce2a946258f.tar.gz
iced-59ef7f074c67126dd8bd0ae9cbc82ce2a946258f.tar.bz2
iced-59ef7f074c67126dd8bd0ae9cbc82ce2a946258f.zip
Merge pull request #46 from memoryruins/from-array
impl From<Array> for Color
Diffstat (limited to 'wgpu/src/renderer/widget/text_input.rs')
-rw-r--r--wgpu/src/renderer/widget/text_input.rs34
1 files changed, 8 insertions, 26 deletions
diff --git a/wgpu/src/renderer/widget/text_input.rs b/wgpu/src/renderer/widget/text_input.rs
index cff8bf23..b5f6c5f6 100644
--- a/wgpu/src/renderer/widget/text_input.rs
+++ b/wgpu/src/renderer/widget/text_input.rs
@@ -25,20 +25,11 @@ impl text_input::Renderer for Renderer {
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,
- }
+ [0.5, 0.5, 0.5]
} else {
- Color {
- r: 0.7,
- g: 0.7,
- b: 0.7,
- a: 1.0,
- }
- },
+ [0.7, 0.7, 0.7]
+ }
+ .into(),
),
border_radius: 5,
};
@@ -64,20 +55,11 @@ impl text_input::Renderer for Renderer {
text.clone()
},
color: if text.is_empty() {
- Color {
- r: 0.7,
- g: 0.7,
- b: 0.7,
- a: 1.0,
- }
+ [0.7, 0.7, 0.7]
} else {
- Color {
- r: 0.3,
- g: 0.3,
- b: 0.3,
- a: 1.0,
- }
- },
+ [0.3, 0.3, 0.3]
+ }
+ .into(),
bounds: Rectangle {
width: f32::INFINITY,
..text_bounds