From f4a4845ddbdced81ae4ff60bfa19f0e602d84709 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 4 Mar 2024 20:42:37 +0100
Subject: Simplify theming for `Button` widget
---
examples/tour/src/main.rs | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
(limited to 'examples/tour/src/main.rs')
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 52e1bbb7..f5791ad7 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -1,7 +1,6 @@
use iced::alignment::{self, Alignment};
-use iced::theme;
use iced::widget::{
- checkbox, column, container, horizontal_space, image, radio, row,
+ button, checkbox, column, container, horizontal_space, image, radio, row,
scrollable, slider, text, text_input, toggler, vertical_space,
};
use iced::widget::{Button, Column, Container, Slider};
@@ -56,18 +55,17 @@ impl Sandbox for Tour {
fn view(&self) -> Element<Message> {
let Tour { steps, .. } = self;
- let controls = row![]
- .push_maybe(steps.has_previous().then(|| {
- button("Back")
- .on_press(Message::BackPressed)
- .style(theme::Button::Secondary)
- }))
- .push(horizontal_space())
- .push_maybe(
- steps
- .can_continue()
- .then(|| button("Next").on_press(Message::NextPressed)),
- );
+ let controls =
+ row![]
+ .push_maybe(steps.has_previous().then(|| {
+ padded_button("Back")
+ .on_press(Message::BackPressed)
+ .style(button::secondary)
+ }))
+ .push(horizontal_space())
+ .push_maybe(steps.can_continue().then(|| {
+ padded_button("Next").on_press(Message::NextPressed)
+ }));
let content: Element<_> = column![
steps.view(self.debug).map(Message::StepMessage),
@@ -676,8 +674,8 @@ fn ferris<'a>(
.center_x()
}
-fn button<'a, Message: Clone>(label: &str) -> Button<'a, Message> {
- iced::widget::button(text(label)).padding([12, 24])
+fn padded_button<'a, Message: Clone>(label: &str) -> Button<'a, Message> {
+ button(text(label)).padding([12, 24])
}
fn color_slider<'a>(
--
cgit