Skip to content

Commit

Permalink
fix most of the widgets and remove the cupertino alert
Browse files Browse the repository at this point in the history
  • Loading branch information
genusistimelord committed Jan 16, 2024
1 parent d6cf778 commit 67f1581
Show file tree
Hide file tree
Showing 50 changed files with 231 additions and 1,118 deletions.
18 changes: 0 additions & 18 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,6 @@
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'cupertino-alert'",
"cargo": {
"args": [
"build",
"--bin=cupertino-alert",
"--package=cupertino-alert"
],
"filter": {
"name": "cupertino-alert",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
Expand Down
78 changes: 40 additions & 38 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,31 @@ quad = []
spinner = []
context_menu = []
segmented_button = []
slide_bar = []

default = [
"badge",
"card",
#"number_input",
#"date_picker",
"number_input",
"date_picker",
"color_picker",
#"floating_element",
"floating_element",
"grid",
#"modal",
#"tab_bar",
#"tabs",
#"time_picker",
# "wrap",
#"selection_list",
# "split",
"modal",
"tab_bar",
"tabs",
"time_picker",
"slide_bar",
"wrap",
"selection_list",
"split",
#"menu",
#"quad",
#"context_menu",
#"spinner",
#"cupertino",
#"segmented_button",
#"num-traits"
"quad",
"context_menu",
"spinner",
"cupertino",
"segmented_button",
"num-traits"
]

[dependencies]
Expand Down Expand Up @@ -90,30 +92,30 @@ members = [
"examples/badge",
"examples/card",
"examples/color_picker",
#"examples/cupertino/cupertino_button",
#"examples/cupertino/cupertino_spinner",
#"examples/cupertino/cupertino_switch",
#"examples/date_picker",
#"examples/floating_element",
#"examples/floating_element_anchors",
"examples/cupertino/cupertino_button",
"examples/cupertino/cupertino_spinner",
"examples/cupertino/cupertino_switch",
"examples/date_picker",
"examples/floating_element",
"examples/floating_element_anchors",
"examples/grid",
#"examples/modal",
#"examples/modal_component",
#"examples/multiple_modals",
#"examples/tab_bar",
#"examples/tabs",
#"examples/time_picker",
#"examples/wrap",
#"examples/number_input",
#"examples/selection_list",
#"examples/split",
#"examples/split_scroller",
"examples/modal",
"examples/modal_component",
"examples/multiple_modals",
"examples/tab_bar",
"examples/tabs",
"examples/time_picker",
"examples/wrap",
"examples/number_input",
"examples/selection_list",
"examples/split",
"examples/split_scroller",
#"examples/menu",
#"examples/spinner",
#"examples/context_menu",
#"examples/WidgetIDReturn",
#"examples/segmented_button",
#"examples/sliderbar",
"examples/spinner",
"examples/context_menu",
"examples/WidgetIDReturn",
"examples/segmented_button",
"examples/sliderbar",
]

[workspace.dependencies.iced]
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ Enable this widget with the feature `menu`.

You might also want to enable the feature `quad` for drawing separators.

### Slide Bar

Please take a look into our examples on how to use slidebars.

Enable this widget with the feature `slide_bar`.


## Quickstart features

Expand Down
6 changes: 3 additions & 3 deletions examples/WidgetIDReturn/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use iced::{
alignment, font,
theme::Theme,
widget::{container, text, Column, Container, Row, Text},
window, Alignment, Application, Command, Element, Length, Settings,
window, Alignment, Application, Command, Element, Length, Settings, Size,
};

#[derive(Debug)]
Expand All @@ -25,9 +25,9 @@ pub enum Message {

fn main() -> iced::Result {
NumberInputDemo::run(Settings {
default_text_size: 12.0,
default_text_size: iced::Pixels(12.0),
window: window::Settings {
size: (500, 400),
size: Size::new(500.0, 400.0),
..Default::default()
},
..Settings::default()
Expand Down
1 change: 1 addition & 0 deletions examples/card/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ fn main() -> iced::Result {
enum Message {
CloseCard,
OpenCard,
#[allow(dead_code)]
Loaded(Result<(), String>),
FontLoaded(Result<(), font::Error>),
}
Expand Down
5 changes: 4 additions & 1 deletion examples/color_picker/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ enum Message {
ChooseColor,
SubmitColor(Color),
CancelColor,
#[allow(dead_code)]
Loaded(Result<(), String>),
FontLoaded(Result<(), font::Error>),
}
Expand Down Expand Up @@ -116,7 +117,9 @@ impl Application for ColorPickerExample {
.center_x()
.center_y()
.width(Length::Fill)
.height(Length::Fill).center_x().center_y()
.height(Length::Fill)
.center_x()
.center_y()
.into()
}
}
Expand Down
11 changes: 0 additions & 11 deletions examples/cupertino/cupertino_alert/Cargo.toml

This file was deleted.

7 changes: 0 additions & 7 deletions examples/cupertino/cupertino_alert/Makefile

This file was deleted.

19 changes: 0 additions & 19 deletions examples/cupertino/cupertino_alert/README.md

This file was deleted.

148 changes: 0 additions & 148 deletions examples/cupertino/cupertino_alert/src/main.rs

This file was deleted.

1 change: 1 addition & 0 deletions examples/cupertino/cupertino_button/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ enum ButtonApp {
enum Message {
EnabledButtonClicked,
EnabledFilledButtonClicked,
#[allow(dead_code)]
Loaded(Result<(), String>),
FontLoaded(Result<(), font::Error>),
}
Expand Down
Loading

0 comments on commit 67f1581

Please sign in to comment.