updated to the next teir of changes to Operations and Program to Appl…

…ication

examples/WidgetIDReturn/src/main.rs

@@ -22,7 +22,7 @@ pub enum Message {
 }
 
 fn main() -> iced::Result {
- iced::program(
+ iced::application(
  "NumberInput example",
  NumberInputDemo::update,
  NumberInputDemo::view,

examples/badge/src/main.rs

@@ -8,7 +8,7 @@ use iced_aw::{helpers::badge, style, style::status::Status};
 const BADGE_TEXT_SIZE: u16 = 15;
 
 fn main() -> iced::Result {
- iced::program("Badge example", BadgeExample::update, BadgeExample::view).run()
+ iced::application("Badge example", BadgeExample::update, BadgeExample::view).run()
 }
 
 #[derive(Debug, Clone)]

examples/card/src/main.rs

@@ -6,7 +6,7 @@ use iced::{
 use iced_aw::{helpers::card, style};
 
 fn main() -> iced::Result {
- iced::program("Card example", CardExample::update, CardExample::view)
+ iced::application("Card example", CardExample::update, CardExample::view)
  .font(iced_aw::BOOTSTRAP_FONT_BYTES)
  .run()
 }

examples/color_picker/src/main.rs

@@ -6,7 +6,7 @@ use iced::{
 use iced_aw::helpers::color_picker;
 
 fn main() -> iced::Result {
- iced::program(
+ iced::application(
  "Color Picker example",
  ColorPickerExample::update,
  ColorPickerExample::view,

examples/date_picker/src/main.rs

@@ -5,7 +5,7 @@ use iced::{
 use iced_aw::{date_picker::Date, helpers::date_picker};
 
 fn main() -> iced::Result {
- iced::program(
+ iced::application(
  "DatePicker example",
  DatePickerExample::update,
  DatePickerExample::view,

examples/drop_down/src/main.rs

@@ -8,7 +8,7 @@ use iced::{
 use iced_aw::{drop_down, DropDown};
 
 fn main() -> iced::Result {
- iced::program(
+ iced::application(
  "ContextMenu example",
  DropDownExample::update,
  DropDownExample::view,

examples/grid/src/main.rs

@@ -170,7 +170,7 @@ fn string_to_vertical_align(input: &str) -> Vertical {
 }
 
 fn main() -> iced::Result {
- iced::program("Grid example", App::update, App::view)
+ iced::application("Grid example", App::update, App::view)
  .font(iced_aw::BOOTSTRAP_FONT_BYTES)
  .run()
 }

examples/number_input/src/main.rs

@@ -15,7 +15,7 @@ pub enum Message {
 }
 
 fn main() -> iced::Result {
- iced::program(
+ iced::application(
  "Number Input example",
  NumberInputDemo::update,
  NumberInputDemo::view,

examples/selection_list/src/main.rs

@@ -5,7 +5,7 @@ use iced::{
 use iced_aw::{selection_list::SelectionList, style::selection_list::primary};
 
 pub fn main() -> iced::Result {
- iced::program("Selection list example", Example::update, Example::view)
+ iced::application("Selection list example", Example::update, Example::view)
  .font(iced_aw::BOOTSTRAP_FONT_BYTES)
  .run()
 }

examples/sliderbar/src/main.rs

@@ -6,7 +6,7 @@ use iced::{
 use iced_aw::SlideBar;
 
 fn main() -> iced::Result {
- iced::program(
+ iced::application(
  "Slider Bar example",
  SlideBarExample::update,
  SlideBarExample::view,

examples/spinner/src/main.rs

@@ -49,7 +49,7 @@ impl SpinnerExample {
 }
 
 fn main() -> iced::Result {
- iced::program(
+ iced::application(
  "Spinner example",
  SpinnerExample::update,
  SpinnerExample::view,

examples/tab_bar/src/main.rs

@@ -5,7 +5,7 @@ use iced::{
 use iced_aw::{TabBar, TabLabel};
 
 fn main() -> iced::Result {
- iced::program(
+ iced::application(
  "Tab Bar example",
  TabBarExample::update,
  TabBarExample::view,

examples/time_picker/src/main.rs

@@ -5,7 +5,7 @@ use iced::{
 use iced_aw::{time_picker::Time, TimePicker};
 
 fn main() -> iced::Result {
- iced::program(
+ iced::application(
  "TimePicker example",
  TimePickerExample::update,
  TimePickerExample::view,

examples/wrap/src/main.rs

@@ -8,7 +8,7 @@ use iced_aw::{NumberInput, Wrap};
 use rand::Rng;
 
 fn main() -> iced::Result {
- iced::program("Wrap example", RandStrings::update, RandStrings::view)
+ iced::application("Wrap example", RandStrings::update, RandStrings::view)
  .font(iced_aw::BOOTSTRAP_FONT_BYTES)
  .run()
 }

src/widgets/card.rs

@@ -480,7 +480,7 @@ where
  state: &'b mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
- operation: &mut dyn Operation<Message>,
+ operation: &mut dyn Operation<()>,
  ) {
  let mut children = layout.children();
  let head_layout = children.next().expect("Missing Head Layout");

src/widgets/drop_down.rs

@@ -142,7 +142,7 @@ where
  state: &'b mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
- operation: &mut dyn Operation<Message>,
+ operation: &mut dyn Operation<()>,
  ) {
  self.underlay
  .as_widget()

src/widgets/grid/widget.rs

@@ -92,7 +92,7 @@ where
  state: &mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
- operation: &mut dyn Operation<Message>,
+ operation: &mut dyn Operation<()>,
  ) {
  for ((element, state), layout) in self
  .elements_iter()

src/widgets/helpers.rs

@@ -245,21 +245,6 @@ where
  crate::TimePicker::new(show_picker, time, underlay, on_cancel, on_submit)
 }
 
-#[cfg(feature = "floating_element")]
-/// Shortcut helper to create a [`FloatingElement`] Widget.
-///
-/// [`FloatingElement`]: crate::FloatingElement
-pub fn floating_element<'a, Message, Theme, Renderer>(
- underlay: impl Into<Element<'a, Message, Theme, Renderer>>,
- element: impl Into<Element<'a, Message, Theme, Renderer>>,
-) -> crate::FloatingElement<'a, Message, Theme, Renderer>
-where
- Message: 'a + Clone,
- Renderer: renderer::Renderer,
-{
- crate::FloatingElement::new(underlay, element)
-}
-
 #[cfg(feature = "grid")]
 /// Shortcut helper to create a [`Grid`] Widget.
 ///
@@ -317,23 +302,6 @@ where
  crate::Wrap::with_elements_vertical(children)
 }
 
-#[cfg(feature = "modal")]
-/// Shortcut helper to create a [`Modal`] Widget.
-///
-/// [`Modal`]: crate::Modal
-#[must_use]
-pub fn modal<'a, Message, Theme, Renderer>(
- underlay: impl Into<Element<'a, Message, Theme, Renderer>>,
- overlay: Option<impl Into<Element<'a, Message, Theme, Renderer>>>,
-) -> crate::Modal<'a, Message, Theme, Renderer>
-where
- Message: Clone,
- Renderer: renderer::Renderer,
- Theme: crate::style::modal::StyleSheet,
-{
- crate::Modal::new(underlay, overlay)
-}
-
 #[cfg(feature = "number_input")]
 /// Shortcut helper to create a [`NumberInput`] Widget.
 ///

src/widgets/number_input.rs

@@ -402,7 +402,7 @@ where
  tree: &mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
- operation: &mut dyn Operation<Message>,
+ operation: &mut dyn Operation<()>,
  ) {
  operation.container(None, layout.bounds(), &mut |operation| {
  self.content.operate(

src/widgets/slide_bar.rs

@@ -62,8 +62,8 @@ where
  /// * an inclusive range of possible values
  /// * the current value of the [`SliderBar`]
  /// * a function that will be called when the [`SliderBar`] is dragged.
- /// It receives the new value of the [`SliderBar`] and must produce a
- /// `Message`.
+ /// * the new value of the [`SliderBar`] and must produce a `Message`.
+ ///
  pub fn new<F>(range: RangeInclusive<T>, value: T, on_change: F) -> Self
  where
  F: 'a + Fn(T) -> Message,

src/widgets/spinner.rs

@@ -179,7 +179,7 @@ where
 
  let bounds = layout.bounds();
 
- if let Event::Window(_id, window::Event::RedrawRequested(now)) = event {
+ if let Event::Window(window::Event::RedrawRequested(now)) = event {
  if is_visible(&bounds) {
  let state = state.state.downcast_mut::<SpinnerState>();
  let duration = (now - state.last_update).as_secs_f32();

src/widgets/wrap.rs

@@ -274,7 +274,7 @@ where
  state: &mut Tree,
  layout: Layout<'_>,
  renderer: &Renderer,
- operation: &mut dyn Operation<Message>,
+ operation: &mut dyn Operation<()>,
  ) {
  for ((element, state), layout) in self
  .elements