me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #107 from Maldela/background

Browse source 
Implemented `From<Color` for `Background`
This commit is contained in:
Héctor Ramón 2019-12-05 00:19:13 +01:00 • committed by GitHub
commit f87ddf1056
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/background.rs
View file

@ -7,3 +7,9 @@ pub enum Background {
Color(Color),
// TODO: Add gradient and image variants
}
impl From<Color> for Background {
fn from(color: Color) -> Self {
Background::Color(color)
}
}

7
core/src/color.rs
View file

@ -37,6 +37,13 @@ impl Color {
}
}
/// Creates a [`Color`] from its RGB components.
///
/// [`Color`]: struct.Color.html
pub fn from_rgb(r: f32, g: f32, b: f32) -> Color {
Color { r, g, b, a: 1.0 }
}
/// Converts the [`Color`] into its linear values.
///
/// [`Color`]: struct.Color.html

4
examples/pokedex.rs
View file

@ -1,5 +1,5 @@
use iced::{
button, image, Align, Application, Background, Button, Color, Column,
button, image, Align, Application, Button, Color, Column,
Command, Container, Element, Image, Length, Row, Settings, Text,
};
@ -225,7 +225,7 @@ impl From<reqwest::Error> for Error {
fn button<'a>(state: &'a mut button::State, text: &str) -> Button<'a, Message> {
Button::new(state, Text::new(text).color(Color::WHITE))
.background(Background::Color([0.11, 0.42, 0.87].into()))
.background(Color::from_rgb(0.11, 0.42, 0.87).into())
.border_radius(10)
.padding(10)
}

6
examples/todos.rs
View file

@ -1,5 +1,5 @@
use iced::{
button, scrollable, text_input, Align, Application, Background, Button,
button, scrollable, text_input, Align, Application, Button,
Checkbox, Color, Column, Command, Container, Element, Font,
HorizontalAlignment, Length, Row, Scrollable, Settings, Text, TextInput,
};
@ -332,7 +332,7 @@ impl Task {
.on_press(TaskMessage::Delete)
.padding(10)
.border_radius(5)
.background(Background::Color([0.8, 0.2, 0.2].into())),
.background(Color::from_rgb(0.8, 0.2, 0.2).into()),
)
.into()
}
@ -361,7 +361,7 @@ impl Controls {
let label = Text::new(label).size(16).width(Length::Shrink);
let button = if filter == current_filter {
Button::new(state, label.color(Color::WHITE))
.background(Background::Color([0.2, 0.2, 0.7].into()))
.background(Color::from_rgb(0.2, 0.2, 0.7).into())
} else {
Button::new(state, label)
};

19
examples/tour.rs
View file

@ -1,5 +1,5 @@
use iced::{
button, scrollable, slider, text_input, Background, Button, Checkbox,
button, scrollable, slider, text_input, Button, Checkbox,
Color, Column, Container, Element, HorizontalAlignment, Image, Length,
Radio, Row, Sandbox, Scrollable, Settings, Slider, Text, TextInput,
};
@ -684,24 +684,17 @@ fn primary_button<'a, Message>(
state: &'a mut button::State,
label: &str,
) -> Button<'a, Message> {
button(state, label).background(Background::Color(Color {
r: 0.11,
g: 0.42,
b: 0.87,
a: 1.0,
}))
button(state, label)
.background(Color::from_rgb(0.11, 0.42, 0.87).into())
}
fn secondary_button<'a, Message>(
state: &'a mut button::State,
label: &str,
) -> Button<'a, Message> {
button(state, label).background(Background::Color(Color {
r: 0.4,
g: 0.4,
b: 0.4,
a: 1.0,
}))
button(state, label)
.background(Color::from_rgb(0.4, 0.4, 0.4).into())
}
#[derive(Debug, Clone, Copy, PartialEq, Eq)]

4
wgpu/src/renderer/widget/slider.rs
View file

@ -29,7 +29,7 @@ impl slider::Renderer for Renderer {
width: bounds.width,
height: 2.0,
},
background: Background::Color([0.6, 0.6, 0.6].into()),
background: Color::from_rgb(0.6, 0.6, 0.6).into(),
border_radius: 0,
},
Primitive::Quad {
@ -57,7 +57,7 @@ impl slider::Renderer for Renderer {
width: HANDLE_WIDTH + 2.0,
height: HANDLE_HEIGHT + 2.0,
},
background: Background::Color([0.6, 0.6, 0.6].into()),
background: Color::from_rgb(0.6, 0.6, 0.6).into(),
border_radius: 5,
},
Primitive::Quad {