updated some examples that dont use theme styles, Also updated select…

…ion list to new Iced Theme Requirements

Cargo.toml

@@ -42,16 +42,16 @@ default = [
  "number_input",
  "date_picker",
  "color_picker",
- #"grid",
+ "grid",
  #"tab_bar",
  #"tabs",
  #"time_picker",
- #"slide_bar",
- #"wrap",
- #"selection_list",
+ "slide_bar",
+ "wrap",
+ "selection_list",
  #"quad",
  #"context_menu",
- #"spinner",
+ "spinner",
  #"drop_down",
  #"menu",
 ]
@@ -82,16 +82,15 @@ members = [
  "examples/number_input",
  "examples/date_picker",
  "examples/color_picker",
- #"examples/font_loading",
- #"examples/grid",
+ "examples/grid",
  #"examples/tab_bar",
  #"examples/tabs",
  #"examples/time_picker",
- #"examples/sliderbar",
- #"examples/wrap",
- #"examples/selection_list",
+ "examples/sliderbar",
+ "examples/wrap",
+ "examples/selection_list",
  #"examples/context_menu",
- #"examples/spinner",
+ "examples/spinner",
  #"examples/WidgetIDReturn",
  #"examples/drop_down",
  #"examples/menu",

examples/grid/src/main.rs

@@ -2,7 +2,7 @@ use iced::widget::{checkbox, container, pick_list, row, slider};
 use iced::Padding;
 use iced::{
  alignment::{Horizontal, Vertical},
- Color, Element, Length, Sandbox, Settings,
+ Color, Element, Length,
 };
 use iced_aw::{grid, grid_row};
 
@@ -17,22 +17,8 @@ struct App {
  debug_layout: bool,
 }
 
-#[derive(Debug, Clone)]
-enum Message {
- HorizontalAlignment(Horizontal),
- VerticalAlignment(Vertical),
- ColumnSpacing(f32),
- RowSpacing(f32),
- FillWidth(bool),
- FillHeight(bool),
- Padding(f32),
- DebugToggled(bool),
-}
-
-impl Sandbox for App {
- type Message = Message;
-
- fn new() -> Self {
+impl Default for App {
+ fn default() -> Self {
  Self {
  horizontal_alignment: Horizontal::Left,
  vertical_alignment: Vertical::Center,
@@ -44,12 +30,22 @@ impl Sandbox for App {
  debug_layout: false,
  }
  }
+}
 
- fn title(&self) -> String {
- "Iced Grid widget example".into()
- }
+#[derive(Debug, Clone)]
+enum Message {
+ HorizontalAlignment(Horizontal),
+ VerticalAlignment(Vertical),
+ ColumnSpacing(f32),
+ RowSpacing(f32),
+ FillWidth(bool),
+ FillHeight(bool),
+ Padding(f32),
+ DebugToggled(bool),
+}
 
- fn update(&mut self, message: Self::Message) {
+impl App {
+ fn update(&mut self, message: Message) {
  match message {
  Message::HorizontalAlignment(align) => self.horizontal_alignment = align,
  Message::VerticalAlignment(align) => self.vertical_alignment = align,
@@ -62,7 +58,7 @@ impl Sandbox for App {
  }
  }
 
- fn view(&self) -> iced::Element<'_, Self::Message> {
+ fn view(&self) -> iced::Element<'_, Message> {
  let horizontal_align_pick = pick_list(
  HORIZONTAL_ALIGNMENTS
  .iter()
@@ -126,8 +122,8 @@ impl Sandbox for App {
  container(contents)
  .width(Length::Fill)
  .height(Length::Fill)
- .center_x()
- .center_y()
+ .center_x(Length::Fill)
+ .center_y(Length::Fill)
  .into()
  }
 }
@@ -174,5 +170,7 @@ fn string_to_vertical_align(input: &str) -> Vertical {
 }
 
 fn main() -> iced::Result {
- App::run(Settings::default())
+ iced::program("Grid example", App::update, App::view)
+ .font(iced_aw::BOOTSTRAP_FONT_BYTES)
+ .run()
 }