Merge branch 'master' into feature/custom-styling

This commit is contained in:
Héctor Ramón Jiménez 2019-12-31 11:37:41 +01:00
commit e98471d5b6
15 changed files with 225 additions and 12 deletions

View file

@ -1,7 +1,7 @@
use iced::{
button, scrollable, slider, text_input, Button, Checkbox, Color, Column,
Container, Element, HorizontalAlignment, Image, Length, Radio, Row,
Sandbox, Scrollable, Settings, Slider, Text, TextInput,
Sandbox, Scrollable, Settings, Slider, Space, Text, TextInput,
};
pub fn main() {
@ -68,7 +68,7 @@ impl Sandbox for Tour {
);
}
controls = controls.push(Column::new());
controls = controls.push(Space::with_width(Length::Fill));
if steps.can_continue() {
controls = controls.push(