Skip to content

Commit

Permalink
fixed color picker for newest iced
Browse files Browse the repository at this point in the history
  • Loading branch information
genusistimelord committed Nov 6, 2023
1 parent 99e5bc1 commit bd88098
Show file tree
Hide file tree
Showing 3 changed files with 164 additions and 122 deletions.
104 changes: 52 additions & 52 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,27 @@ context_menu = []
segmented_button = []

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

[dependencies]
Expand All @@ -72,48 +72,48 @@ itertools = { version = "0.11.0", optional = true }


[dependencies.iced_widget]
#git = "https://github.com/iced-rs/iced.git"
#rev = "8221794"
version = "0.1.1"
git = "https://github.com/iced-rs/iced.git"
rev = "751ea77c29f6eb3d00f45f0a04c833a1d03a425c"
#version = "0.1.1"

[profile.dev.package."*"]
opt-level = 2

[workspace]
members = [
"examples/badge",
"examples/card",
#"examples/badge",
#"examples/card",
"examples/color_picker",
"examples/cupertino/cupertino_alert",
"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/menu",
"examples/spinner",
"examples/context_menu",
"examples/WidgetIDReturn",
"examples/segmented_button",
#"examples/cupertino/cupertino_alert",
#"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/menu",
#"examples/spinner",
#"examples/context_menu",
#"examples/WidgetIDReturn",
#"examples/segmented_button",
]

[workspace.dependencies.iced]
#git = "https://github.com/iced-rs/iced.git"
#rev = "8221794"
version = "0.10.0"
git = "https://github.com/iced-rs/iced.git"
rev = "751ea77c29f6eb3d00f45f0a04c833a1d03a425c"
#version = "0.10.0"
features = ["advanced", "lazy", "tokio"]

[workspace.dependencies.iced_aw]
Expand Down
4 changes: 2 additions & 2 deletions src/native/color_picker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ where
self.underlay.as_widget().width()
}

Check failure on line 175 in src/native/color_picker.rs

View workflow job for this annotation

GitHub Actions / all

Diff in /home/runner/work/iced_aw/iced_aw/src/native/color_picker.rs

fn layout(&self, renderer: &Renderer<Theme>, limits: &Limits) -> Node {
self.underlay.as_widget().layout(renderer, limits)
fn layout(&self, tree: &mut Tree, renderer: &Renderer<Theme>, limits: &Limits) -> Node {
self.underlay.as_widget().layout(&mut tree.children[0], renderer, limits)
}

fn on_event(
Expand Down
Loading

0 comments on commit bd88098

Please sign in to comment.